git test b
Merge branch 'master' of https://github.com/tricorder42/whodunnit

Conflicts:
	main.rb