No need to merge twice.
Added some additional checks to develop.

To ensure that the develop branch exists and is configured.
Added executable permissions to git-flow-develop
Removed the check for the develop branch.

Figured having the is_develop_configure check is enough.
Fixed the makefile
Make the git-flow-develop non executable
Checkout to develop after pushing to master
Merge branch 'master' into develop

Conflicts:
	git-flow-develop
Test commit
fixed the quote
Removed a few lines
gah
Merge remote-tracking branch 'origin'

Conflicts:
	git-flow-develop