Initial netbeans project
Merge branch 'master' of https://github.com/nickyadvokaat/Database_Technology

Conflicts:
	.gitignore