zzz
Merge branch 'master' of github.com:stonefruit/SIGOT

Conflicts:
	Gemfile.lock
	config/routes.rb
basic weather