new file:   test
	modified:   test :discription
	new file:   about : about this
Merge branch 'testing'
	new file:   dev
	new file:   bugFix
Merge branch 'testing' into bugFix

Conflicts:
	bugFix

	modified:   bugFix
Merge branch 'master' into bugFix
Merge branch 'master' into dev
Merge branch 'bugFix'
	new file:   dev
Merge branch 'master' of https://github.com/showc7/test
	new file:   testing
Merge branch 'testing' of https://github.com/showc7/test into testing