Edited .gitignore to add /nbproject/ and /resources
Merge branch 'master' into evilplan