added merge sort (tri fusion)
minor code formatting
Merge branch 'master' of github.com:Drulex/ele440_labo1