add 2nd line of info
add 3nd line of info
Merge branch 'master' of https://github.com/killuazhu/test-project

Conflicts:
	readme

files manually merged