need to pull
Merge branch 'master' of http://github.com/ethanmn/CPE476Final

Conflicts:
	src/globals.cpp
	src/graphics/shadow_map.cpp
Merge branch 'master' of http://github.com/ethanmn/CPE476Final

Conflicts:
	src/globals.cpp
Merge branch 'master' of http://github.com/ethanmn/CPE476Final

Conflicts:
	src/globals.cpp
Merge branch 'master' of http://github.com/ethanmn/CPE476Final
Merge branch 'master' of http://github.com/ethanmn/CPE476Final

Conflicts:
	src/globals.cpp