Merge branch 'master' of http://github.com/tcsullivan/gamedev

diff --cc test.frag
index 0bb64a69e478d3d2760d4c964158ff8ffd3126a7,1c1e77b2dec34e316d50e7c4369b9998266ed25a..083fc0bc6b2b54010fb6a4df8dfa35a29fafd87a
--- 1/test.frag
--- 2/test.frag
+++ b/test.frag
@@@ -1,10 -2,11 +2,10 @@@
  uniform sampler2D sampler;\r
  \r
  uniform int numLight;\r
- uniform vec2 lightLocation[10];\r
+ uniform vec2 lightLocation[255];\r
  uniform vec3 lightColor;\r
  uniform float amb;\r
 -// uniform float lightStrength;\r
 -//uniform float screenHeight;\r
 +\r
  void main(){\r
        vec4 color = vec4(0.0f,0.0f,0.0f,0.0f);\r
        for(int i = 0; i < numLight; i++){\r