aggiunta esercizi
Merge branch 'master' of https://github.com/rexos/kokko

Conflicts:
	app/views/programs/index.html.erb