nested models, tarun is in a cow
merge
some changes
Merge branch 'master' of https://github.com/tarunnurat/UIUCHack