add logo
Merge branch 'master' of git://github.com/esoergel/peacecorps
Merge pull request #12 from thadk/master

add logo
Merge pull request #11 from qkslvrwolf/master

changed charfield to textfields where appropriate
Clean styling, add bootstrappy navbar
Add sample sidebar content; sidebar not yet responding to navbar
added some logic to login page
Merge branch 'master' of https://github.com/esoergel/peacecorps into develop
fixed merge conflicts
Merge branch 'master' of https://github.com/esoergel/peacecorps