updating for markdown
Merge branch 'master' of github.com:stir/Algorithms_course

Conflicts:
	notes/Analysis of Merge Sort.md