Update lab1writeup.txt
Merge branch 'master' of https://github.com/emmastein/cosc460

Conflicts:
	mysimpledb/writeups/lab1writeup.txt
lab2 finished