deleted DEF+-

deleted DEF+-
Merge branch 'master' of https://github.com/bleedcoder/mygit-test

Conflicts:
	test