Merge branch 'master' of C:\Users\ssouthworth\WebstormProjects\chumpr_code with conflicts.
changelog