trololol

I trolololled a 10l
Merge pull request #7 from Zaqua/general-info

trololol