creation of a troll

you need two magic potions and a wooden stick
Merge remote-tracking branch 'origin/master'

Conflicts:
	troll.rb