workflow

We want to keep the tests folder out of master branch for now. Thus the following workflow can be used:

git checkout dev
git pull

git checkout -b Feature_1
...coding...
git commit -am ''
git push

git checkout dev
git pull
git merge Feature_1
git push

git checkout dev-pre-merge
git pull
git merge dev

git checkout master
git pull
git merge dev-pre-merge

git branch -D Feature_1
git push origin --delete Feature_1