Implemented bumpmapping/cel-shading
Added bumpmapping
Merge branch 'master' of https://github.com/bisen/cs123FinalProject

Conflicts:
	final.pro
	shaders/shader.frag
	shaders/shader.vert
	view.cpp
	view.h