first commit
second commit
third commit
fourth commit
Merge branch 'master' into develop

Conflicts:
	readme.rtf
fifth commit
sixth commit
Merge branch 'master' of https://github.com/TimeKillerA/GitTest