W15 update 1
Merge branch 'master' of https://github.com/coursemdetw/2014cda

Conflicts:
	wsgi/pandoc/result.aux
	wsgi/pandoc/result.html
	wsgi/pandoc/result.out
	wsgi/pandoc/result.pdf
	wsgi/pandoc/result.tex
	wsgi/pandoc/result.toc
	wsgi/pandoc/result.txt
	wsgi/pandoc/result.xdv
update