Working on getting a database connected.
Merge branch 'master' of github.com:austintrose/hackathon-project
Because I want to push.
Merge branch 'master' of github.com:austintrose/hackathon-project