Slightly less embarrassing version -- kudos to Stephen Chin
Merge branch 'master' of github.com:Adopt-a-JSR/JSR-356

Conflicts:
	tictactoe/client/src/main/java/org/bejug/tictactoe/client/TicTacToeClient.java
Resolved using "theirs"