workshop
updated code

Merge branch 'master' of https://github.com/webbedfeet/workshop

Conflicts:
	Hour1.R