Init with gitignore
Merge branch 'Try_shader'

Conflicts:
	.gitignore
Merge branch 'master' into Try_shader

Conflicts:
	.gitignore