saving changes
Merge branch 'master' of https://github.com/shmueyb/SoftwareFinalProject
separate tests
adding tests
merge