test delete
Merge branch 'master' of github.com:jmaccarl/RTES

Conflicts:
	.gitignore