Did surrounding weather stuff and started on handlebars
Merge branch 'master' of github.com:theCodeBear/ToyotaHackathon

Conflicts:
	public/javascripts/main.js
	public/javascripts/ui.js
	views/index.ejs