ignore netbeans files
ignore files
Remove netbeans files.
Files remove
Merge branch 'master' of https://github.com/ayann/planning_tool

Conflicts:
	web/bundles/planning/css/home.css