Tweaks
Merge branch 'master' of https://github.com/DiegoGarza/EventFeed

Conflicts:
	app/controllers/static_controller.rb
Removes unnecessary file
Merge branch 'master' of https://github.com/DiegoGarza/EventFeed
Merge branch 'master' of https://github.com/DiegoGarza/EventFeed
Fixes sendgrid first mail