Revert 7e7e99e..d95df49

This rolls back to commit 7e7e99e49517ce766e99638c9157d76e2b6a9340.
Merge branch 'master' of https://github.com/Bultako/testGit

Conflicts:
	otherFile.txt