weird person teset
Merge branch 'master' of https://github.com/shmueyb/SoftwareFinalProject