merge
before css merge
Merge branch 'master' of github.com:SummersAdvertising/creating-code
before css merge
Merge branch 'master' of github.com:SummersAdvertising/creating-code
ready for deploy