wtf? why was this ignored? htf did i do this?
Merge branch 'master' of github.com:machinshin/Nitro
Commit Nitro to master
Merge branch 'Vat-Merge' of github.com:machinshin/Nitro into Vat-Merge