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
Adds block canvas and block content to base.html
Merge branch 'develop' of github.com:tedtieken/coderaising into develop
added logo files Nate sent out, and created a favicon
Merge branch 'develop' of jellybean into develop
updated base.html to put the h1 and breadcrumb into the canvas block.
added a dummy template and tied it in to the urlconf and views
Merge pull request #2 from esoergel/feature/dummy_templates

Feature/dummy templates
Adds slashes to end of urls for consistency.
Fixes URL names
add profile url
profile template
profile templates and url
move profile templates into deeper folder
adds model fields
added projects app
Merge pull request #3 from brianjyee/feature/profiles

Feature/profiles
Merge branch 'feature/projects' of git://github.com/tkeemon/coderaising into feature/separate_apps