add content.json
wrong path master
update gruntfile
v2.1
update package.json and gruntfile.js
update gruntfile
remove grunt from travis-conf
Merge branch 'master' into gh-pages

* master:
  remove grunt from travis-conf
  update gruntfile
  update package.json and gruntfile.js
  v2.1
  update gruntfile
  wrong path master
  add content.json

Conflicts:
	.travis.yml
	gruntfile.js
	package.json
	src/css/style.css
	src/js/script.js