First commit
Remove magic strings
Merge branch 'master' of github.com:mervynwee/CS2103