Nesto moje, nema veze
Merge branch 'master' of https://github.com/ib2013/androidapp

Conflicts:
	src/com/example/helloworld/MainActivity.java