Added loading stuff to database upload thing
Merge branch 'master' of https://github.com/knowbody/Team6