new shader
Merge branch 'master' of https://github.com/LuckyMarq/collide
improved gamepad and map fill in
Merge branch 'master' into Leif