Added a test shader, updated main to use it
Shader loading can now take a shader of any size, vertex color depends on light position
Light calculation fixed
Added a fragment shader, renamed vertex shader file
Moved shader code to seperate files, cleaned up main slightly.
Added GLSL shader code.
The program now uses the glsl vertex shader.
Merge branch 'development'
Merge branch 'development' into shaders

Conflicts:
	Makefile (fixed)
	main.cpp (fixed)
update makefile
Merge branch 'development'
modified collision algorithm
rewrote main to use glfw instead of glut
Merge branch 'shaders' into glfw

Conflicts:
	Makefile (fixed)
	main.cpp (fixed)
fixed shader code
Merge branch 'collision' into glfw

Conflicts:
	main.cpp (fixed)
fixed demo code