Package.json, jslint installed with npm dependencies and jslint inside the makefile
Replacement of Tabs with spaces in MakeFile, sorry
Merge pull request #22 from fabiofabbrucci/master

Package.json
remove nbproject from .gitignore
fix conflict