meh
Merge branch 'master' of https://github.com/matt-riley/runt-claps

Conflicts:
	app.rb