shader update
Merge branch 'master' of https://github.com/Hatscat/LD29

Conflicts:
	public/js/config.js