merge has bugs

debugging time
Merge remote-tracking branch 'origin/master'

Conflicts:
	Triangle Mesh Processor Nov 2014/main/meshClass.pde
Merge branch 'master' of https://github.com/li4rich/P09