modified on the lesson
Merge branch 'test'

Conflicts:
	OOP/Battle.cpp
	OOP/BattleLogger.cpp
	OOP/BattleLogger.h
	OOP/Elf.cpp
	OOP/Gnome.cpp
	OOP/Ork.cpp
	OOP/Unit.cpp
	OOP/Unit.h
	OOP/headers.h