Pierced the singularity.
Trying to recommit...

t
Merge branch 'master' of https://github.com/inkku/Starproject

Conflicts:
	.gitignore