Merge branch 'master' of https://github.com/samper/final-project-sage

Conflicts:
	Billera-Lee polytopes.sagews