Added .gitignore file to base dir
Resolved conflicts after merge branch 'master' of https://github.com/AlexFalappa/gmltool

Conflicts:
	.gitignore
Updated NetBeans project files to NB8