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