Merge pull request #8 from joshchapman/master

updating shaders to deal with ambient light
Merge pull request #9 from joshchapman/master

collision between cars - only pull if want this implementation
Both weapon collision implemented, score also implemented