Merge branch 'Main_activity' of https://github.com/drinkssu/YourVoiceAlarm into Main_activity

Conflicts:
	app/src/main/java/com/drinkssu/yourvoicealarm/RecordVoice.java