updated the package.json and moved some of my files around
Merge branch 'master' of https://github.com/SugarHacks/SugaHack

Conflicts:
	package.json