fixing git
Merge branch 'master' of https://github.com/ckinne1771/IntegratedProject2