Merge branch 'hotfix/1.2.0'
Merge branch 'develop'

* develop:
Update README.md
Merge branch 'develop'

* develop:
  Update gem spec file
Update README.md
Readme
Merge branch 'master' of https://github.com/jomalley2112/controller_scaffolding

* 'master' of https://github.com/jomalley2112/controller_scaffolding:
  Update README.md