Add nav bar and modify links
Merge branch 'master' of https://github.com/6e0r9e/Toddlr
Fixed associations WORKING COMMIT
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