added something nice.
another change
Merge branch 'merge-practice'
Revert e7bc816..70c9453

This rolls back to commit e7bc816bd58d8584dfea753d1faa43894a393f96.
lower down
Merge branch 'merge-practice'

Conflicts:
	config.ru - left in the lower down stuff.