adding regular mergeSort
Merge branch 'master' into back

Conflicts:
	sorting/mergeSort.coffee