hold
Fixed stuff
fixed
Stuff
Classes
merge fixes
using theirs
Merge branch 'master' of https://github.com/thEtan/Mini-Project