pdf stuff
Merge branch 'master' of github.com:MazMachine/Coen174

Conflicts:
	COEN174/sample.html
Merge branch 'master' of github.com:MazMachine/Coen174

Conflicts:
	COEN174/sample.html