write-up date
Merge branch 'master' of https://github.com/lucilley/CS3300Project1

Conflicts:
	pa1.tex