Merge pull request #1 from evildmp/master

Updating my master with changes in his master?
Merge pull request #3 from evildmp/master

updaating with master stuff
Merge pull request #4 from evildmp/master

updaating
Merge pull request #5 from evildmp/master

updating
Merge remote-tracking branch 'upstream/master'
Update conflicts.rst

duplicate line:
    $ git add attendees_and_learners.rst
Merge pull request #88 from jasonblum/master

Small edit to conflicts.rst