Groups index working, needs checked_in and moderator functionality
Starting on logins, will switch branch accordingly
Merge branch 'master' into groups_through

Conflicts:
	config/routes.rb
	db/schema.rb
Log in, log out working
Merge branch 'master' of github.com:johnathon101/project-workhang

Conflicts:
	app/models/user.rb
Merge branch 'master' into logins