Added Hex featuresm, gitignore netbeans
fixed conflict in .gitignore
feature generation to hexes