Added a comment on line 4
Added another comment
Added comment to cause a merge conflict
Merge branch 'fizbuz'

Conflicts:
	ex26.rb
Added files for blur and linked list