Second one
Another branch
Merge branch 'ozges_branch'
Added some extremely important code
Deliberately adding conflict
- Print out a BMI for given person
Merge branch 'master' into stevesbranch

Conflicts:
	src/sample.rb