minor not working tweaks.
Merge branch 'master' of http://github.com/topched/CMPUT410W14-Group-Project