initial project version
My secon commit
Third commit
Forth commit
test.txt content test 1
test.txt content add test 2
test.txt some text deleted
add text brunch01
add text hotfix
Edited brunch01
Edited brunch01
Merge branch 'branch01'

Conflicts:
	myproj.txt
Merge branch 'master' of https://github.com/Storkur/myproj

Conflicts:
	.gitignore