Commit to receive

test
Merge branch 'master' of https://github.com/kaneschutzman/hackathon-starter

Conflicts:
	package.json