Initial commit
integrating git-flow
merge conflicts