MASSIVE COMMIT BEFORE PRESENTATION

I hate git