Fixed shaders. Fixed tiny automerge error.
Merge branch 'master' of github.com:svenstaro/gamejam

Conflicts:
	GGJ2013/data/shaders/distort.glsl