Add Netbeans files to gitignore
Merge branch 'master' of github.com:/mineichen/gameProject