a commit
Merge branch 'master' of github.com:4lk4tr43/Test

Conflicts:
	_working_file_.h
com