Small changes and tweaks
Merge branch 'master' of https://github.com/puikinsh/infinitum

Conflicts:
	screenshot.png
Small improvements