pulled changes to user and controller model
added migration and models for tags, snippet_tags, cheatsheet_tags
'pulled down changes to cheatsheet model'
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/snippets
Merge pull request #4 from abcm1989/master

changes to migrations and models