Merge branch 'master' of https://github.com/shaypal5/OrZukFinalProject

Conflicts:
	__pycache__/parseProcessedDataFileForScikit.cpython-34.pyc

Merge remote-tracking branch
'origin/master'

Conflicts:
	__pycache__/parseProcessedDataFileForScikit.cpython-34.pyc

New Sample selector