fixed it!
Merge branch 'master' of github.com:JoachimHolmer/Rymdkyrka

Conflicts:
	Assets/Editor/TextureEdgeFiller.cs