Merge pull request #119 from COPPER-BOBCAT/staging

Staging
removed swipe
Merge pull request #120 from zindlerb/master

undid swipe