committing before mobilizing
Merge branch 'master' of https://github.com/lawsumisu/lawsumisu_DavidBocek_POM

Conflicts:
	four/src/Triangle.h
	four/src/Triangle.h~
pushing to updated. trying to figure out why hit.texCoord is always [0,0]