commit
Merge branch 'master' of https://github.com/xiehuier/xiehuier.git

Conflicts:
	res/layout/activity_main.xml
df