Adding game_events resource and joins
Removing swap file
Merge branch 'events' of github.com:bfosberry/GameSocial into events

Conflicts:
	app/models/game_event.rb
	app/views/game_events/_form.html.erb
	config/routes.rb
	db/schema.rb