Game
test ajax
Merge branch 'game'

Conflicts:
	workshop/www/js/index2.js