Solutions
Merge branch 'master' of github.com:JumpstartLab/warmup-exercises
Add grandma example
Add robot name exercise
Merge branch 'master' of github.com:JumpstartLab/warmup-exercises
First Extensions
Timers
Add example code for robot name
adding puts
Improve robot example
Fix putsing in readme
Merge pull request #1 from raphweiner/patch-2

adding puts
Adding the 07-Psych Warm-Up
Merge remote-tracking branch 'upstream/master'

Conflicts:
	06-robot-name/README.md