updated
Merge branch 'master' of https://github.com/CMPUT302W14T04/Interface