daves changes
Revert "daves changes"

This reverts commit 9d732cc46d4eb1edd45cda04ac0de842a85e0f3a.
warlockbar fix
Merge pull request #1 from Hubbo/master

pull me drae