gjhdkfhgajkfdskjhlfhgjkdshfklajsdfhgjkldshfkjladshfkjdsahkfljdsahjfahdskjlfasd
Merge branch 'bfs'

Conflicts:
	world.js