all ok
Merge branch 'master' into dev
added new practice code
Merge branch 'dev'

Conflicts:
	rubycode/ticket.rb