Primary import
Merge branch 'master' of github.com:puiterwijk/rhythmbox-alarm-clock

Conflicts:
	.gitignore