Merge pull request #11 from mikegiberson/master

Get Tram's part
Add New Database Script

Sunny forgot the most important part of the merger.
Merge pull request #40 from syhc/master

Add database