resolve conflicts
Merge branch 'master' of https://github.com/cs2103aug2014-t16-2j/main.git
finish block and unblock