Merge pull request #4 from r3xy/Morsels_are_delish

changed route names
added validations and changed password fields
Merge pull request #5 from r3xy/caro_caro

added validations and changed password fields
Merge branch 'master' of https://github.com/r3xy/sugr into Morsels_are_delish

Conflicts:
	app/views/account_page.erb
fixing things, i think