merging
Merge branch 'master' of https://github.com/phillipou94/HackDuke2014