Merge pull request #4 from swirlycheetah/develop

Merge pull request #3 from swirlycheetah/master
Merge pull request #5 from swirlycheetah/develop

combine css files into single minifed request
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge remote-tracking branch 'origin/develop'