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
Working map pointers
individual infowindows onclick
working links from infowindows to place page
small fix on no photo reference returned, come on google get your act together
merge prep
Merge branch 'master' into googapi2

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
Merge branch 'master' into mybranch

Conflicts:
	db/schema.rb
	db/seeds.rb