Testing merging revisions with git.
Merge branch 'leaderboard' of
https://github.com/davidcthornton/GamegogyBlock.git into leaderboard

Conflicts:
	WebContent/leaderboard_config.jsp