commit before pulling
Merge branch 'master' of https://github.com/FusionJT/Layergloss

Conflicts:
	file-test