Lmao get rid of merge errors
Merge pull request #15 from Explouad/master

Lmao get rid of merge errors