Fixing things for the better
Merge branch 'master' of https://github.com/jmburges/jawbonehackathon

Conflicts:
	app.rb