more stuff getting ready for stuff
Merge branch 'master' of https://github.com/andren32/dbas_sqllab