merged heather's edits by hand
added db
Merge pull request #9 from lzhou89/master

getting new model files?
Merge pull request #5 from jkru/master

reconcile