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

Conflicts:
	algorithms.hpp
	main.cpp