user page update
Merge branch 'master' of https://github.com/JamieWoodbury/Dinr

Conflicts:
	app/views/auth/signup.erb
	db/db.sqlite3
updated user