save
untrack modules
remove node_modules
shjs
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	Gruntfile.js
	package.json
	src/controller/Main.coffee
	src/view/Main.coffee
remove unused files