05
06
Revert "05"
07
This reverts commit 6d572fcbbd6c38cefcee6e7edbe0cf0db435405f.

Conflicts:
	dummy.txt
	test.txt
08
added + dependency
added
Merge branch 'master' into retour

Conflicts:
	test.txt
09
09 09
Merge branch 'master' of github.com:nosp4m/temp

Conflicts:
	dummy.txt