dunno
Merge branch 'master' of github.com:tiy-chs-q4-fee/rageCake
fixed merge
Merge branch 'master' of github.com:tiy-chs-q4-fee/rageCake into margaretH1
nothing
styles
fixed footer
Merge pull request #46 from ansleyjones/ansleysass

fixed footer
styled
fixed footer
Merge pull request #47 from wgallop99/pages

Pages
fixed merge conflict