Merge pull request #42 from nullet/testing_like_crazy

Testing like crazy
attempts login controller tests
Merge branch 'master' into testing_like_crazy