rolled back and changed
Merge branch 'development' of https://github.com/allen-hunter/testrepo into development

Conflicts:
	newfeature.h