creating a merge conflict
Merge branch 'master' of https://github.com/s-mc/rthw

Conflicts:
	ex14c.rb