added in developer arms
Test Successful!
My suggested map
fixed conflicts, attempting merge
Small fixes from conflicts

fixed a couple little things I missed the first time around when
resolving the conflicts.
Merge pull request #12 from IN3D/devel/mergeTest

Mergeing devel/mergeTest into master