rzeczy
Merge branch 'master' of https://github.com/wojtekblack/ludumdare30

Conflicts:
	project/Assets/Images/pLATFORM.png.meta
	project/Assets/Scenes/MainScene.unity
	project/Library/CurrentMaximizeLayout.dwlt
	project/Library/assetDatabase3
	project/Library/guidmapper