added modified layouts
adding cname and deleting scss
remove unecessary stuuff
Merge branch 'polymer'

Conflicts:
	_includes/nav.html
	css/main.scss
	index.html