reverted to old version
removed CNAME from master branch
update
clean slate
Merge branch 'master' into gh-pages

Conflicts:
	_includes/js/app.js