Conflicts:
	.gitignore
added delete function