Replace ' by "
Add Gruntfile an css / js files
Merge branch 'Grunt'
Merge branch 'master' into tests

Conflicts:
	README.md