Merge pull request #4 from krafttuc/add-ignore-file

Add gitignore file
Fix bug
Fix bug
Merge branch 'master' into develop