development.log
merge conflicts
delete cache
Merge branch 'master' of github.com:ingridh/railsdecalproj2
added more events to seeds.rb that are now appearing in views
added event models to seeds.rb that are now rendering in views
Merge branch 'master' of github.com:ingridh/railsdecalproj2

Conflicts:
	app/models/user.rb
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/development/sass/1ad4ac3876942904d185e06780afc4916fe9facc/application.css.scssc
	tmp/cache/assets/development/sass/1ad4ac3876942904d185e06780afc4916fe9facc/comments.css.scssc
	tmp/cache/assets/development/sass/1ad4ac3876942904d185e06780afc4916fe9facc/events.css.scssc
	tmp/cache/assets/development/sass/1ad4ac3876942904d185e06780afc4916fe9facc/framework_and_overrides.css.scssc
	tmp/cache/assets/development/sprockets/3b6dcd003fc0345f0451081fc42b30fa
	tmp/cache/assets/development/sprockets/53640067d96589fbc39f702a6e19b645
	tmp/cache/assets/development/sprockets/685f0f61426b98eae00e3fbb55ccfc42
	tmp/cache/assets/development/sprockets/88d619ecb1068dbdbe8eba7c0056e44c
	tmp/cache/assets/development/sprockets/8ab512c9b33ac90e699b73469d71f061
	tmp/cache/assets/development/sprockets/bcca522c6302f184f12fe0e8a7d7e71a
	tmp/cache/assets/development/sprockets/c13fc73ceafa45876a901b3e775b83ae
	tmp/cache/assets/development/sprockets/eb955148dff1a927d71ba221df32d1ac
	tmp/cache/assets/development/sprockets/fa6b53e34e4abad5deba3f8a4b016f50
	tmp/pids/server.pid