Adjust valley damage
Player health is 100
Scale up all on enemies
Scale up on all other damage
Adjust the drawing of huds
Prevent damage from small heights.
Fix Musicians fo merge
clear all merge conflict
Adjust consumables health given.

Also add pink potion to cheats for testing
Fix indentations for modified files
adjust liquid damage
Adjust indentation
Fix Merge Conflicts
Merge branch 'master' of git://github.com/hawkthorne/hawkthorne-journey into damage
Merge pull request #1908 from DaNiwa/damage

Adjust Damage