Added offcanvas menu, removed bottom button row, fixed bug in option 4 naming
Merge branch 'odell'

Conflicts:
	index.html
	js/marginCalc.js
Merging changes
Fixed merge issues