before pull
Merge in Kain's change
Merge branch 'master' of https://github.com/tianxind/cpwiki
redirecting back to cp when editing character from cp