more improvements
Update attendees_and_learners.rst
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
work on conflicts
more git docs
numerous improvements
version number
index
index
Update attendees_and_learners.rst
Update attendees_and_learners.rst
Update attendees_and_learners.rst

Added my name to the Chicago DjangoCon attendees list.
Update attendees_and_learners.rst
Update attendees_and_learners.rst
Update attendees_and_learners.rst
Merge pull request #74 from bahendri/barbara

Update attendees_and_learners.rst
Merge pull request #1 from evildmp/master

upstream merge
Merge pull request #1 from evildmp/master

merging upstream master on Github
Merge pull request #1 from evildmp/master

Updating my master with changes in his master?