omg that was a huge conundrum but i was just gitignoring the libraries aaaaaaaaargh
Merge remote-tracking branch 'origin/master'