Merge branch 'dev' into 'master'

.gitignore

CHANGELOG.md

build.ps1

ccmod_resources/resources/encrpt.ps1

ccmod_resources/resources/img/karryn/attack/condoms.psd

...d_resources/resources/img/karryn/attack/emptyCondom_1.png

...d_resources/resources/img/karryn/attack/emptyCondom_2.png

...d_resources/resources/img/karryn/attack/emptyCondom_3.png

...d_resources/resources/img/karryn/attack/emptyCondom_4.png

...d_resources/resources/img/karryn/attack/emptyCondom_5.png

...d_resources/resources/img/karryn/attack/emptyCondom_6.png

ccmod_resources/resources/img/karryn/attack/fullCondom_1.png

ccmod_resources/resources/img/karryn/attack/fullCondom_2.png

ccmod_resources/resources/img/karryn/attack/fullCondom_3.png

ccmod_resources/resources/img/karryn/attack/fullCondom_4.png

ccmod_resources/resources/img/karryn/attack/fullCondom_5.png

ccmod_resources/resources/img/karryn/attack/fullCondom_6.png

...ources/resources/img/karryn/cowgirl_lizardman/condoms.psd

.../resources/img/karryn/cowgirl_lizardman/emptyCondom_1.png

.../resources/img/karryn/cowgirl_lizardman/emptyCondom_2.png