Added more
Merge branch 'master' of https://github.com/frankdede/CMPUT410W14G09