updated
Merge branch 'master' into gh-pages

Conflicts:
	app/styles/main.scss
	app/views/main.html
Merge branch 'master' into gh-pages

Conflicts:
	app/styles/main.scss
	app/views/main.html