Merge branch 'master' into gh-pages

Conflicts:
	I-am-a-horse-in-the-land-of-booleans.html
	README.html
	basic-tools.html
	blorg.html
	conan-the-librarian.html
	index.html
	looping-is-recursion.html
	one-function-to-rule-them-all.html
	p-p-p-pokerface.html
	predicates.html
	recursion.html
	structured-data.html
	style.html
	sudoku.html
	training-day.html
Removed obsolete remark of updated exercise.
Merge branch 'master' of github.com:iloveponies/120-hour-epic-sax-marathon
Merge branch 'gh-pages' of github.com:iloveponies/120-hour-epic-sax-marathon into gh-pages

Conflicts:
	basic-tools.html
Broken makefile and added update-project.html
Broken Makefile fixed
Merge branch 'master' into gh-pages
Removed obsolete remark about updated exercise