testing font sizes
fixing leftover menus and stuff
Merge branch 'master' of https://github.com/zoidd/Cali-Sandwich-App

Conflicts:
	cali.html