gross activity_main.xml
Merge branch 'master' of https://github.com/blchang/splist.git

Conflicts:
	res/layout/activity_main.xml

	And added stuffs...
Merge branch 'master' of https://github.com/blchang/splist.git