Merge branch 'master' of https://github.com/Salamandar/Fractalis

Conflicts:
	.gitignore