code from warmup - Emily Platzer
Merge pull request #42 from craftninja/patch-2

code from warmup - Emily Platzer