Minor changes for push to Heroku
Added documentation
Established database connection
Merge branch 'server'