.
Merge branch 'master' of https://github.com/Ale1/other

Conflicts:
	split.rb