today's work
Merge branch 'master' of https://github.com/SpencerAnastasio/barter-town

Conflicts:
	app/lib/init-routes.js
	app/routes/users.js