Merge remote-tracking branch 'forry/master'
Merge remote-tracking branch 'forry/master'
Merge remote-tracking branch 'dan/master'
Merge remote-tracking branch 'dan/master'
Merge remote-tracking branch 'forry/master'
Added dummy data to second dummy account and fixed a few bugs
Merge remote-tracking branch 'dan/master'
Fixed a stupid mistake
Added "Login failed!" message if login fails (duh)
Also changed "Austin" account to "Forry" to reduce confusion
Merge remote-tracking branch 'numberQ/master'
Merge remote-tracking branch 'DMuckerman/master'