getting it to github
Merge branch 'master' of https://github.com/pkunze/AlarmDisplay

Conflicts:
	.gitignore