deleted
Merge branch 'master' of https://github.com/dgedela/myrepo

Conflicts:
	new.txt
a new java file