updating w/new npm module test doc
api
something to stash
fixing merge conflict
merging master
merging with master
merged
merging
populated all parts of the adventure for Kid theme (still getting illegal character response from wfy)
merge in master, fix illegal characters, activate outkids theme
merge master, fix conflict in dbmain
Merge pull request #33 from PCS-Javascript-Junkies/charity

Charity
merge in master, fix conflict in dbmain