made major changes
Merge branch 'master' of github.com:costrou/cpsc462

Conflicts:
	html/js/app.js
	html/partials/projects.html
	parallelProg03/index.html
	parallelProg04/html/index.html
	parallelProg05/html/index.html
	parallelProg06/html/index.html
Merge branch 'master' of github.com:costrou/cpsc462
Adding markdown and mathjax support