tags model and controller
git push origin sabar
Merge branch 'master' of github.com:fhinson/santa into sabar