chopped HTML files
remove nbproject dir from git
Merge remote-tracking branch 'origin/master'