Testing conflicting Change2
Merge branch 'develop' of https://github.com/dcx/nvie-branchingmodel-test into develop

Conflicts:
	fizzbuzz.py