Merge pull request #10 from lzhou89/master

seed file and whatever
Merge pull request #11 from lzhou89/master

added query for user by id
updated milkshare.py, seeded db
Merge pull request #6 from jkru/master

reconcile updates