creating unmergeable branch
creating unmergeable branch
bring unmergeable branch up to date
remove _build
Merge remote-tracking branch 'origin/master' into unmergeable-branch
tidying
Making the branch unmergeable
making another unmergeable branch
Update attendees_and_learners.rst
Merge pull request #1 from evildmp/master

merging upstream master on Github
added my github name
Merge pull request #2 from evildmp/master

update master from upstream
amended
fixed conflict
fixed another conflict
merge hhajar
merge david
Merge branch 'master' of github.com:evildmp/afraid-to-commit