Secondary and tertiary layouts
Merge branch 'master' of github.com:anindyabasu/COGS187AFinalProject