Setting up database
Merge pull request #4 from brint/master

Setting up database