database crap
merging database crap
Merge branch 'master' of github.com:johnwm47/487-Project