Revert "formating"

This reverts commit 35352041a56bff52bd591b29cfb1231162fd9858.
Merge branch 'master' of https://github.com/travis2861/TestRepo

Conflicts:
	main.cpp
zsdfv