Working ...
Merge branch 'master' of https://github.com/cjpatton/256

Conflicts:
	proj/project.tex