This project uses (or at least makes a vague hand-waving attempt at using) the git-flow release model.

As such, please keep the following in mind:

• New features should be based on the develop branch.
• Bug fixes should be based on the master branch.