Delete application.yml
Merge branch 'master' of https://github.com/ccampb13/rounding_third

Conflicts:
	config/application.yml
update
assets compiled for Heroku
small change to omniauth
small change to omniauth, take 2
change to devise
fixed new registration email
Merge branch 'develop'
syntax changes to trips_controller
removing whitespace