Merge branch 'master' of https://github.com/esoergel/peacecorps
add LOGIN_URL
Merge branch 'master' of https://github.com/esoergel/peacecorps
Merge pull request #14 from qkslvrwolf/master

extra setting
added a sample JSON method
fixed merge conflicts
First commit of blog stuff with list and creation. Still TODO:

 * Permissions
 * Images
 * Styling
 * TinyMCE/Markdown for posts
 * Confirm for Delete
Merge pull request #15 from baconz/master

First pass at blog (very minimal)
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
added permissions to blog (pcvprofile is commented out)
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