i s2g this merge is gonna destroy my code again
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/jebadirad/CSC335FinalProject.git
if this ruins everything again i quit