Merge from branch to master

Simple merge from branch to master

git checkout master
git pull origin master
git merge test
git push origin master