conflict2
Merge branch 'master' of https://github.com/ureczky/hellogitdroid.git

Conflicts:
	bin/classes/com/example/hellogitdroid/MainActivity.class