Sometimes I do stuff on the fly
Merge branch 'merge-please' into garage_door

Conflicts:
	public/javascripts/alarm.js
	public/javascripts/app.js
	views/keypad.haml