grunt task now build sass to css
minified css and js with grunt task
amended travis ci

Conflicts:
	package.json
grunt sass and uglify is integrated
amended back travis
made grunt task travis
updated package
triggering travis build
Merge branch 'min'