Merge pull request #3 from jbohren-forks/master

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

Update dev_guidelines.md
Merge pull request #5 from jbohren-forks/gh-pages

merge