revert changes (which will be applied to develop branch instead)
Merge branch 'master' of github.com:Anahkiasen/former