heroku iter1
Merge branch 'master' of https://github.com/cosimo-dw/NamingSaaS
modeling characters
resolve conflict