shader stuff
cel shading and some intersection fixes
Merge branch 'master' of github.com:bmatejek525/Graphics

Conflicts:
	.DS_Store
	src/Makefile
	src/particleview