testing updated for new setup
seems nice
Merge remote-tracking branch 'origin' into ELSE

mergin
Merge pull request #7 from XanderGlassman/ELSE

Else