Added shader
Merge branch 'master' of https://github.com/AcidVenom/ludumdare29

Conflicts:
	src/js/assets.js
	src/js/main.js