deploybutton commit
Merge branch 'master' of heroku.com:weatherbeacon

Conflicts:
	Gemfile
	Gemfile.lock