Fix git
Merge origin/master
Fixing things and stuff