commit
merging
Merge branch 'master' of git@github.com:mparsha1/CS496TeamProject.git
merged - weird file bug