build 25
- fix for #231
Build 25

Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	README.md
	single_include/catch.hpp