merge
using ours'
Merge branch 'master' of https://github.com/alokedesai/Database-Setup
Merge branch 'master' of https://github.com/alokedesai/Database-Setup
Merge branch 'master' of https://github.com/alokedesai/Database-Setup