adding pick-a-slam
Merge branch 'newmodules' into jeff-standard
adding pick-a-slam