Added column shuffling
Merge pull request #341 from jfarid27/master

Added column shuffling