From Cmake to Make
Merge branch 'makefile_docs'

Conflicts:
	install.md