Merge pull request #7 from lzhou89/master

getting new model thing
Merge pull request #8 from lzhou89/master

merging other files
Merge pull request #4 from jkru/master

reconcile updates