Corrected citation of the work of Joseph Kim
Prepare exercise2.md for code embedding by include
Refactor Makefile
Merge branch 'master' into gh-pages
Add includes.hs filter to Exercise2/Makefile and some refactoring
Refactored top-level Makefile
Rebuild website files