no message
Merge branch 'master' of https://github.com/sail032/VoiceReminder

Conflicts:
	.classpath