Промених си тука едни глупости
Merge remote-tracking branch 'origin/master'

Conflicts:
	HelloGitWorld/src/com/seeburger/bicng/gittests/HelloGitWorld.java