Finished first out of the User model
User model with passwords, and user show page
User signup complete
Done with sign in
After test
Merge branch 'sign-in-out'

Conflicts:
	webrat.log