working copy
Merge branch 'master' of https://github.com/lbel11l/objectDelete

Conflicts:
	.idea/workspace.xml
some git issues