step 1

Any features, hotfixes, etc go to branches before being merged
   to develop then master.