moved link to stylesheet out of compress block
Merge branch 'develop' of git://github.com/tedtieken/coderaising into develop
fixed merge error in base.html
Merge pull request #1 from esoergel/develop

Demonstrating Merge