Forgot
Merge branch 'game_logic' of https://github.com/andrewpei/rock-paper-scissors into game_logic

Conflicts:
	server.rb