Revert "second try"

This reverts commit 84db22ad37819edb88563cda20a65a74ae6e2812.

Conflicts:
	Project1/bla.txt
Merge branch 'master' of https://github.com/DarkHarke/Project1
useless files deleted