routineGenerator exercise selector working
merging
fixed merge conflicts