Updated the gitignore and some other shit
Merge pull request #5 from 12-01Game/master

updated to master again