NetBeans test
Merge branch 'master' of https://github.com/chrisk90/test
Took out NetBeans test