Servlet/game logic rearranged
Merge branch 'master' of http://www.github.com/hdxconnor/risque