pre pull commit
Merge branch 'master' of github.com:phillipou94/HackDuke2014
no merge conflicts