Yiou add a change
Merge branch 'master' of https://github.com/yiochen/Diary.git

Conflicts:
	src/yiou/yeseul/yuzhe/android/MainActivity.java