Merge pull request #39 from 210geeks/Joseph

added auth filter to base controller
associative table fixes - run migrate
Merge pull request #40 from 210geeks/ryan

run migrate - associative table fixes - run migrate
Merge pull request #41 from 210geeks/Joseph

finished CRUD for users, style edits on master