updated requirements.txt
tweaked settings file for heroku
tweaked settings file for heroku
modified procfile to run devserver
finished project/<id>/edit-project pages. updated urls.py to use only primary key for reverse
moved everything over to use SlugField (and broke backwards compatability with the database, sorry)
user profile functionality
got url project/propose_project working
Merge branch 'develop' of git://github.com/esoergel/coderaising into develop
Merge branch 'develop' of https://github.com/esoergel/coderaising into feature/profiles
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