Börk
Merge branch 'master' of https://github.com/Marcz55/Fightwrench

Conflicts:
	main.cpp