before pulling kain's changes
fix conflicts
before pulling css
Merge branch 'master' of https://github.com/tianxind/cpwiki
added tagging