trying to pull
Merge branch 'master' of https://github.com/jennyallen/rails-project

Conflicts:
	morethancoffee/db/development.sqlite3

wq
Merging
erge branch 'master' of https://github.com/jennyallen/rails-project
Merge branch 'master' of https://github.com/jennyallen/rails-project
ldkjfsdf

project
Playing around with layout
Doing styling on events page
Final styling -jenny
Unsuccessful changes
Hopefully removed the problems
Deleted user_mailer controller
Final Commit