ckeditor for admin
Static page editing
Form is in a folder
Connected wysiwyg to templates
Merge pull request #32 from calblueprint/ckeditor

Ckeditor
Changed description of resources to be WYSIWYG
Merge pull request #33 from calblueprint/resource_wysiwyg

Changed description of resources to be WYSIWYG
Unpacked the html from wysiwyg so html doens't shot up in our views
Merge pull request #34 from calblueprint/wysiwyg_fix_views

Unpacked the html from wysiwyg so html doens't shot up in our views
Custom error pages
Merge pull request #35 from calblueprint/custom_errors

Custom error pages
Added media directory
Merge pull request #36 from calblueprint/add_media

Added media directory
Update requirements.txt
Adding media file furreal now
Delete blah.txt
Merge branch 'master' of github.com:calblueprint/suitcaseClinic
Merge branch 'add_media' of github.com:calblueprint/suitcaseClinic into add_media
Adding for real
Merge pull request #37 from calblueprint/add_media

Add media