Merge branch 'master' of https://github.com/theswolf/SpeechReminder

Conflicts:
	speechreminder/.gitignore