stash fix
Merge branch 'master' of https://github.com/Senior-Project-2013/Worphles
Fixed chat scroll, added scoreboard to pregame lobby
Merge branch 'master' of https://github.com/Senior-Project-2013/Worphles