Adding a conflict
I added my name to conflict line
added my name to conflict line
added name to conflict line
Merge pull request #24 from aschiller8/master

adding my name to conflict line