Changing some files around
Merge branch 'master' of https://github.com/ThomasKluiters/milligram-IRC