Fixing merge instructions
Merge pull request #3 from jbohren-forks/master

Fixing merge instructions