Merge pull request #16 from winglam/master

getting what we did with model
whatt???
merging sucks
Trying to commit some changes
Merge pull request #98 from nhlien93/master

pushing to master. hopefully this will work