Merge pull request #31 from Mchapuis/master

truck! And apparently like 200 other files wtf
Merge pull request #32 from Mchapuis/master

I'm a change! Pull me!
Merge pull request #22 from mysteriosum/master

bla