middle of writing project/edit-project page
finished project/<id>/edit-project pages. updated urls.py to use only primary key for reverse
got url project/propose_project working
Merge branch 'develop' of git://github.com/esoergel/coderaising into develop
fixed footer
added links to 'project_propose' and 'project_edit' in index.html and detail.html respectively
Merge branch 'develop' of git://github.com/esoergel/coderaising into develop
used project.slug for project_description urls. updated urls.py to deal with multiple dashes
minor change to settings.py
Merge branch 'feature/profiles' of https://github.com/brianjyee/coderaising into devserver
Merge branch 'develop' of git://github.com/esoergel/coderaising into feature/projects
cities/cohorts views
Merge branch 'develop' of git://github.com/esoergel/coderaising into develop
Merge pull request #3 from tkeemon/develop

Develop
Merge pull request #4 from Jmorton429/develop

cities/cohorts additions
minor tweaks to get all the commits together
added an OR to twitter stuff
fixed twitter
Merge pull request #5 from brianjyee/feature/profiles

remove update button
Merge branch 'develop' of https://github.com/esoergel/coderaising into devserver