Merge branch 'master' of https://github.com/adamcsmith/JumpStart-API

Conflicts:
	README.md
Merge branch 'master' of https://github.com/adamcsmith/JumpStart-API

Conflicts:
	README.md