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