Allt
Merge branch 'master' of https://github.com/calis182/3D_project_2

Conflicts:
	3D_project_2/Code/BlendState.cpp
	3D_project_2/Code/TemplateMain.cpp

Signed-off-by: Carl Bengtsson <cebbe_theking@hotmail.com>