Merge pull request #146 from ChristinaLK/2015-01-13

new schedule for january
replacing "bootcamp" with "workshop"

consistent with newer SWC terminology
updated location
Adding instructor assignments