Added prject merging Jake and my changes
Merge branch 'master' of https://github.com/MiguelArambula/Group8SeniorDesign