Checking branching
Merge pull request #1 from schrockblock/develop

Checking branching