updating dummy to try to push and cause fast-forward error
Merge branch 'master' of github.com:jacksinn/git-features