minor updates
Merge branch 'master' of https://github.com/kazzam12/zadanie

Conflicts:
	src/sk/monstersfactory/app/MonsterFactoryActivity.java