refactored controller to a degree
refactored controllers/models added current user/login a user
merged master so this is all good
Merge pull request #91 from red-admirals-2014/controller_model_refactor

Controller model refactor