Merge branch 'words'
Added tests for logging in
Added invalid login error message