Merge pull request #17 from ghostsnstuff/master

Merge pull request #1 from AubG/master
Merge pull request #18 from ghostsnstuff/master

added: gitignore stuff
Merge pull request #2 from AubG/master

Update: master branch