land.cpp
Merge branch 'master' of https://github.com/ah450/Towers-of-Hanoi

Conflicts:
	Makefile
	main
	main.cpp
Merge branch 'master' of https://github.com/ah450/Towers-of-Hanoi

Conflicts:
	main.cpp