Merge pull request #1 from 2pioneers/develop

Develop
Merge pull request #2 from 2pioneers/develop

Looked over. Appears to be config. Like the git flow layout.
Merge pull request #6 from 2pioneers/master

Syncing