Day 5
Merge branch 'master' of https://github.com/johncabibbo/dbs
Merge branch 'master' of https://github.com/johncabibbo/dbs
Day7
Merge branch 'master' of https://github.com/johncabibbo/dbs

Conflicts:
	homework/mfleming/.DS_Store
Day 8
Merge branch 'master' of https://github.com/johncabibbo/dbs