modified in master
commit seven to mxie2013 local repository
Merge branch 'master' of https://github.com/mxie2013/ubc_bootcamp