templates
Merge branch 'master' of https://github.com/olkido/libigl

Conflicts:
	include/igl/barycenter.cpp
	include/igl/n_polyvector_general.cpp
	include/igl/slice.cpp