Merge pull request #1 from esoergel/develop

Demonstrating Merge
Adds block canvas and block content to base.html
Merge branch 'develop' of github.com:tedtieken/coderaising into develop
Merge branch 'develop' of jellybean into develop