Finished first cut User model
User model with passwords, and user show page
finish
Merge branch 'modeling-users'

Conflicts:
	.DS_Store
	app/.DS_Store
	app/views/.DS_Store