sync database to sqlacademy orm, add instructions for setup
Merge remote-tracking branch 'origin/master'