Sync what i gots 'n stuff
Merge branch 'master' of https://github.com/bogoroh/JungleStore

Conflicts:
	project2/config/routes.js