world registration
Merge branch 'master' of github.com:gamesoftheyear/g

Conflicts:
	test.html