Merge branch 'master' of https://github.com/JLDLaughlin/AngryAlarm

Conflicts:
	README.md
dfasioh