Finished the merge-sort algorithm

But Python built-in sort is much faster than me ^^
Merge branch 'master' of https://github.com/g-goessel/python-training

Conflicts:
	tri.py