commit1
add index.txt
README commit
commit lib/masterlib.txt
add new file
commit index.txt
update
Merge branch 'mergetest' into develop
update
#1
Merge remote-tracking branch 'opo/develop'

Conflicts:
	.gitignore
	README.md