Reverted the previous dummy commits
Merge github.com:NoodleEducation/gitflow
Merge branch 'master' into develop
minor; delete temp file