Added error message displaying when logging in.
Resolves #1. (Test)
Merge remote-tracking branch 'origin/master'