'Already up to date' error when merging dev into master. so manually
pushing to master
Merge branch 'master' into dev
Bug fixing ques and counter increments