Syncing Commit
Merge branch 'master' of https://github.com/JamesZinger/HumberCollegeGAMEWinter2014

Conflicts:
	Advanced Graphics/Advanced Graphics.sdf
	Advanced Graphics/Advanced Graphics.v12.suo
	Advanced Graphics/Assignment-2_Skybox/main.cpp