updated user loader
added database.php
Merge branch 'master' of https://github.com/GWShark0/hackathon
updated user loader