-.-
Merge branch 'master' of https://github.com/fibbo/steepestdescent

Conflicts:
	.DS_Store
	Makefile
conjugate gradient method completed

hardcoded example added