Merge pull request #1 from gypsydave5/master

Pulling in commits made while pairing
Revert "Pulling in commits made while pairing"
Merge pull request #1 from henryaj/revert-1-master

Revert 1 master