First commit.
Merge branch 'master' of github.com:XinyueZ/alarmdemo

Conflicts:
	.gitignore