Introduced JSHint and CSSLint using Grunt
hit grunt lint or grunt jshint or grunt csslint
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gruntfile.js
Changed name of Gruntfile.js to gruntfile.js