-new method
Merge branch 'test'

Conflicts:
	test.mcl/src/com/example/test/mcl/MichaelActivity.java
Merge pull request #1 from michalciolek/master

lol