Merge pull request #80 from COPPER-BOBCAT/staging

Merge conflict resolution
added ng touch
Merge pull request #81 from zindlerb/master

Added ng touch