Merge pull request #7 from rkawauchi/master

Test code to learn sqlalchemy syntax
fix merge conficts