0_О
Merge branch 'master' of https://github.com/VulpesCorsac/Tron

Conflicts:
	New Project/headers/Wall.h
	New Project/sources/Wall.cpp
	New Project/tron_prj.v12.suo