populated the database
Merge branch 'Joseph'
Merge branch 'john'