Merge normal texture with others
Merge branch 'gbuffer1'

Conflicts:
	README.md