added second line
resolved merge conflict
Merge branch 'jcyoder-master'

Resolved the merge conflict created by near-simultaneous forks