Change the title to ashk
Merge branch 'amahoro'

Conflicts:
	src/sample.rb