Submitted code on GitHub
Merge branch 'master' of github.com:sandhose/nodejs-alarmclock

Conflicts:
	.gitignore