design, bitch
Merge pull request #3 from pwaldhauer/master

Updated the .gitignore, bitch
Merge pull request #1 from UARRR/master

Merge upstream changes