test branch
add test file
Add masterTest file
Merge branch 'test'
modified
test branch
mater branch
Merge branch 'test'

Conflicts:
	test
issue branch
issue from master
Merge branch 'issue'
Update README
modified readme
merged from server
merge conflicts