Testing Push
Merge branch 'release-1.0'

Conflicts:
	README.md
no comment
Merge branch 'no_brian'
no comment
Merge branch 'no_brian'
no comment
Merge branch 'no_nick'
Merge branch 'develop'

Conflicts:
	README.md
Fixing a production issue
Merge branch 'foo_hotfix_FOOB-00'
Merge branch 'develop' into foo_feature_fly_to_mars_FOO-60