we want something
Merge branch 'master' of https://github.com/winark/Android

Conflicts:
	Java/src/Hello.java