Revert "Go Go Go In the Main git pull!"

This reverts commit 95e84172596bcda94fad082823d433c55f536455.
Merge branch 'master' of github.com:Elarnon/north-american-octo-wight
Stuff
Merge branch 'master' of github.com:Elarnon/north-american-octo-wight

Conflicts:
	optimal/main
	optimal/main.cc
	optimal/routage.cc
	optimal/routage.hh
	optimal/sole
	optimal/solee
	optimal/soleee
	optimal/soleep
	optimal/soleepe
Sort of working