Add first part of Rumpelstiltskin
Merge branch 'add-rumpelstiltskin'

* add-rumpelstiltskin:
  Add first part of Rumpelstiltskin
Merge remote-tracking branch 'origin/master'

* origin/master:
  Add Voldemort

Conflicts:
	README.md