Revert "."

This reverts commit aff4d4831636885c9890adf05c8630d09c01bc43.
updated for new citadel
Merge pull request #19 from rourke750/master

Revert "."