got rid of unnecessary returns and fixed indentation
Merge branch 'develop' of ssh://github.com/mtdbass5/audio-testing into develop
added logic to start at the beginning of shuffled data if shuffling is enabled