update main activity layout
Merge branch 'master' of github.com:RuiqingQiu/CSSA

Conflicts:
	res/layout/activity_main.xml