added stuff and fixed collapse on main nav
Merge branch 'master' of https://github.com/ksc4130/ambro-siasgreekpastries.com