mockup complete

ready for show and tell with client
Merge branch 'master'

Conflicts:
	css/main.css
	index.html