added brave.gif
Merge in new stuff from upstream and fix merge conflicts.
Merge pull request #19 from AbstractBeliefs/master

Add :brave: