100% Finished nothing else I can think of to fix
Merge branch 'master' of github.com:joey180x/Sahara