Server/Client
Merge branch 'master' of github.com:pizzaboy314/342NetworkGame
Merge remote-tracking branch 'origin/master' into sgmbranch
changed server
Merge branch 'master' of git@github.com:pizzaboy314/342NetworkGame.git
Merge branch 'master' into sgmbranch
Cleaned up some little stuff, moved back Stuff to how Ian wnated it
originally (I believe)