Adds User Controller and password encryption
Adds missing files
Merge branch 'master' into user_profile_page
Adds user routes

Conflicts:
	app/controllers/users.rb