adding sara's recap of django workshop
Merge branch 'austin_recap'
Merge remote-tracking branch 'upstream/master'
moving picture down so blog page shows text
Merge pull request #116 from estherbester/austin_recap

adding sara's recap of django workshop