Save
Merge branch 'master' into gh-pages

* master:
  Save

Conflicts:
	index.html
	js/effects.js
	main.css