Merge pull request #19 from ZooTypers/master

updating lindseys changes
fixed multiplayer has merge stuff in it
Merge pull request #101 from winglam/master

fixing multiplayer.java merge problems