Cleanup
Merge branch 'master' of https://github.com/fargestifter/Futilia

Conflicts:
	readme.md
Something borrowed
Merge branch 'master' of https://github.com/fargestifter/Futilia

Conflicts:
	readme.md