Password Confirmation and Strong parameters in controllers
Merge branch 'master' of https://github.com/NathanielWroblewski/chowheroes

Conflicts:
	app/controllers/users_controller.rb