minor changes
Merge branch 'master' of https://github.com/esoergel/peacecorps into develop
more template work
updated user models
Merge branch 'master' of https://github.com/esoergel/peacecorps
display names properly in the admin interface
Merge pull request #16 from baconz/master

Permissions on blog
AJAX view now works
Merge branch 'master' of https://github.com/esoergel/peacecorps into develop
unfinished attempt to get teacher home to function as a form
Merge branch 'master' of https://github.com/esoergel/peacecorps
update migration
added queryset filtering example
Edits before presentation
Merge pull request #17 from qkslvrwolf/master

beginnings of work on the teacher home page
Merge branch 'master' of github.com:esoergel/peacecorps
Merge pull request #19 from beechnut/master

Add sample content to sidebar, correct map
put in some boilerplate to the AJAX view
Merge branch 'master' of https://github.com/esoergel/peacecorps into develop
Merge branch 'master' of https://github.com/esoergel/peacecorps