Lab 2.2 Finished
Finished Lab 3.1
Merge branch 'master' of github.com:a1exjones/db3