Added the user model and controller, with some views
Merge branch 'develop' into feature/user-login
Added roles, finished the login system, and added the right view files
Added the test file
Fixed merge conflicts
Added some changes to the user test files
Fixed merge conflict
Deleted some controllers tests
Fixed merge conflict
Fixed issuses with my projects
Fixed the iginore fucking again
Removed the UserModel and used the Teacher instead, as a login model
Merge pull request #13 from runeandersen92/feature/user-login

Feature - Login and Roles
fixed mergeconflicts