Update .gitignore
updated model file
Merge pull request #4 from caisyn/modelupdate

updated model file
updated controllers
Merge branch 'master' into controllers