Merge branch 'master' into feature
fixes
cleaning up and simplifying
removing unnecessary shit
styled out basic form for playdates
added proper routes
Changes
Merge branch 'master' into feature

Conflicts:
	app/controllers/events_controller.rb
	app/models/event.rb
	app/models/playdate.rb
	app/models/user.rb
	app/views/events/_form.html.erb
	app/views/playdates/_form.html.erb
	config/routes.rb
	db/schema.rb
fixes and remerged from master
add name to a user
Merge branch 'master' into feature

Conflicts:
	app/controllers/events_controller.rb
	app/models/event.rb
	app/models/playdate.rb
	app/models/user.rb
	app/views/events/_form.html.erb
	app/views/playdates/_form.html.erb
	config/routes.rb
	db/schema.rb
merging
commited
name in user model, reincorporated foundation
Merge branch 'feature'
basic style fixes
removing unneeded css files
Merge branch 'feature'
Merge pull request #1 from mixedmedia/master

Please Pull These changes