Merge remote-tracking branch 'origin/master' into bingehack-immemorial
5 New Gehennom Levels
Mammon, Lolth, Lilith, Sammael, and Cthulhu
This patch is JUST the levels, which compile and work fine on their own, but they will have randomized monsters rather than their titular hellish beasts until they are added in, in another commit
Added 6 legendary demons
Pazuzu, Mammon, Lolth, Lilith, Sammael, and Cthulhu
Merge branch 'bingehack-immemorial'
Merge branch 'master' of https://github.com/ComputerScienceHouse/bingehack4
Implement DRUNK_ROLL.

While here, don't return from the switch. In case we want to do something
after it in a future patch.
Merge pull request #22 from wxsBSD/drunken_update

Implement DRUNK_ROLL (a feature of Drunken Boxing)
Update README

fixes #8
readme file MD extension
README improvements
CMakeMacroParseArguments requires CMake>=2.8.3
LibRussHarmon (C-language JSON parsing library)
Ring of Power

The Ring of Power, based off of the One Ring from Tolkein Lore, is a new
artifact added to the game. The Ring of Power has many special effects
in line with Tolkein Lore, inlcuding appearing on hobbits, viewing the
ring text when in fire (but only readable when you are a wizard),
messages when throwing into lava, and even Nazgul to follow you around
and ruin your day.
Merge branch 'ring-of-power'

Fixes #6, closes #32.
Make the output files of makedefs depend on makedefs.

Previously, there was an implicit dependency on the _presence_ of
makedefs, but not a hard dependency on it. Since game information which
is written out by makedefs (e.x. artifacts) is compiled directly into
the binary, a weak dependency simply on the presence of makedefs is
insufficient. A strong dependency is needed to make the files generated
by makedefs be rebuilt when e.x. artifacts are added to the game.
Merge pull request #28 from eatnumber1/makedefs-dependencies

Make the output files of makedefs depend on makedefs.
merge multiple upstream build-dependency fixes
Merge branch 'master' of https://github.com/ComputerScienceHouse/bingehack4