Merge branch 'master' of github.com:alexmakers/rockpaperscissors into lizardspock-web

Conflicts:
	javascript/lib/RockPaperScissors.js