Merge pull request #14 from golden-bears-2014/Controller_Refactor

Controller refactor
fixed a user autho bugat index
merged with current master and no conflicts found