Added meteor!
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/game/entities/player.js
	lib/game/main.js