Example update, in hopes of a merge conflict

(This is an in-class example)
Merge branch 'master' into jurnell_cool_changes