move success
Merge branch 'master' of https://github.com/livingjigsaw/OOP_adventure_project

Conflicts:
	1.cpp
	a.out