Newly UX
Merge branch 'master' into gh-pages

Conflicts:
	index.html
	scripts/app.js
	styles/main.css