bla

bla
Merge branch 'master' of https://github.com/c8r1z1/SkyLife

Conflicts:
	bin/.gitignore