unknown changes
merge upstream master
seeded database
Merge pull request #56 from stcrestrada/master

Merge Estrada