add sidebar
correct placing of map
add nav
Merge branch 'hack_chris' into jui

Conflicts:
	index.html
edit css
Merge branch 'hack_chris' into jui
edit size
Merge branch 'hack_chris' into jui
fix mac select
Merge branch 'hack_chris' into jui
Merge branch 'jui'