changing a few things
Merge branch 'master' of https://github.com/dmanty45/database2p1