Update readme
User model with passwords, and user show page
Merge branch 'modeling-users'

Conflicts:
	README.markdown