before pull
Merge branch 'master' of https://github.com/CMPUT301W14T04/Team04Project
Merge branch 'master' of https://github.com/CMPUT301W14T04/Team04Project
change location in create comment + icon for reply, and change location