Pushed lab 2 up
Merge branch 'master' of https://github.com/johncabibbo/dbs

Conflicts:
	homework/.DS_Store
	homework/mfleming/.DS_Store
ds store garbage