some other code
Merge branch 'master' of https://github.com/mmahalwy/ph-hackathon-backend

Conflicts:
	app/controllers/users_controller.rb