Adding Works
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	public/css/index.css
	public/js/Flashy.js