Fog
Merge branch 'develop' of https://github.com/ggj/ggj14 into develop

Conflicts:
	resources/gui/views/mainmenu.rml
	resources/textures/menu_background.png
Textura
Merge branch 'develop' of https://github.com/ggj/ggj14 into develop