Merge branch 'master', remote-tracking branch 'spin/master'
Merge branch 'master', remote-tracking branch 'spin/master'
Fleshing out upload and database
Merge pull request #4 from kevin-cole/master

fleshing out db and upload