deleted
Merge branch 'master' of https://github.com/erc-alan/testrepo

Conflicts:
	README
this is a sub folder test