updated testing
Merge branch 'master' of https://github.com/brittanyrompa/SeniorDesign

Conflicts:
	Testing Git.docx
Initial Upload
fixed conflict