Updated model associations
Merge branch 'master' into homepage

Conflicts:
	app/controllers/index.rb
	app/views/index.erb
another BCrypt commit
completed login, signup, signout