+ Bug Fix #2
Merge branch 'master' of https://github.com/MaxFrax/splitter

Conflicts:
	.gitignore