Resolve merge conflict by replacing userGuide.md with the copy from master, only change Taskell.jar and include a link to release
Resolve merge conflict by replacing userGuide.md with the copy from master, only change Taskell.jar and include a link to release

CS2103AUG2016-W15-C3/main