init
Merge branch 'master' of https://github.com/vanvincent/JHU_Summer2014