merged geoffs layout into master
Merge branch 'master' of github.com-zabador:zabador/CSE_480