1. Checkout master code from github.
cd into development directory, then run:
git checkout -b development origin/master
This simultaneously pulls down the master, and switches you into a development branch on local server.
2. Develop on local dev server, and track on remote development branch.
Make changes and updates. Repeat the following as much as needed:
git add .
git commit -m "commit message"
git push origin development:development
This will create a secondary parallel branch in github.
3. Merge development with master in github.
git checkout master
git merge --no-ff development
git branch -d development
git push origin master
git push origin :development