Merge pull request #3 from ZooTypers/master

oull
Merge pull request #20 from ZooTypers/master

merging with chels changes
multiplayer model now throws the correct exceptions when appropriate
Merge pull request #4 from ZooTypers/master

oull
Merge pull request #9 from ZooTypers/master

Getting updates.
adding changes
Merge pull request #21 from nhlien93/master

getting lindseys changes
Working on testing the multiplayer model and view.
committing multiplayer test
fixing error screens
Merge pull request #119 from dyxliang/master

Pull update.
error screens now show up accordingly, timer now runs from 59-0 and app
icon now no longer looks like a keyboard!
Merge pull request #121 from winglam/master

error screens now show up, timer runs from 59-0 & app icon is no longer a keyboard!
Merge pull request #5 from ZooTypers/master

pull
Merge pull request #20 from ZooTypers/master

update
Fixed javadocs
Merge pull request #125 from cdallas/master

Fixed javadocs
Merge pull request #6 from ZooTypers/master

pull
fixed login bug, made new login screen, etc
Merge pull request #126 from littlpunk/master

push