Updating application for heroku
Merge branch 'master' of https://github.com/nickfreeman/LocationTracker

Conflicts:
	config/application.rb