inb4 merge conflicts
Merge branch 'master' of https://github.com/Jaapp-/Java-YouTube-Player