merge
merge
merge
commit
Merge branch 'master' of https://github.com/patrykos91/Laikos

Conflicts:
	.gitignore
Collision handle fix