derp changes#6

Open

asavage8 wants to merge 2 commits intolaboon:masterfrom

asavage8:wjl_derp

Commits on Nov 10, 2015

derp changes
laboon
committed

Commits on Oct 16, 2017

Merge branch 'master' into wjl_derp
asavage8
authored