resolve merge conflict Merge branch 'master' of https://github.com/CS2103JAN2017-W09-B2/main
resolve merge conflict
Merge branch 'master' of https://github.com/CS2103JAN2017-W09-B2/main

CS2103JAN2017-W09-B2/main,CS2103JAN2017-W09-B2/main