Merge changes and resolve conflicts

Conflicts:

	css/styles.css
	game.js
	lacuna.js
	mapPlanet.js