conflict
Merge branch 'master' of https://github.com/drinkssu/YourVoiceAlarm

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

conflict 해결 예제