-new layout
-fix error
-new method
-new lol
Merge branch 'test'

Conflicts:
	test.mcl/src/com/example/test/mcl/MichaelActivity.java