chrisfan commit test
Merge branch 'master' of github.com:krushton/iolab-lecture3
commit attempt #2