reconcile
resolve merge conflicts
Merge pull request #7 from masidonion/joe_sim

reconcile