second file commited
change
commitzi hirtelen
Merge branch 'ag'
conflict creation step1
merge conflict creation part 2
Merge branch 'ag'

Conflicts:
	second.txt
ag100
first
sixth
ag4
ag5
Merge branch 'master' of github.com:Krisztian-Huterjak/gitszeged

Conflicts:
	second.txt