removed nbproject from git (hopefully)
added nbproject back to ignore
removed more prject files:
removed more project files v2
added .idea back to ignore
JSON changes
Merge branch 'master' of https://github.com/HDXconnor/Risque