add shader when entering box
Merge branch 'master' of github.com:Dibel/3D-Explorer

Conflicts:
	view.h
Add material and shader