Initial commit
added aaa.txt
mod aaa.txt
added bbb.txt
changed aaa.txt
Merge branch 'development'
empty
mod bbb.txt
Merge branch 'development'

Conflicts:
	bbb.txt
mod aaa.txt
Merge branch 'development'

Conflicts:
	aaa.txt
Merge branch 'master' of https://github.com/mgellert/practice

Conflicts:
	aaa.txt