msg
Merge branch 'master' of https://github.com/rudyduvnjak/GlobaForze2

Conflicts:
	.gitignore