expanded database stuff
Merge branch 'master' of github.com:wyrllyn/JEEproject