Implementing settings
Merge branch 'master' of https://github.com/rtoal/cher-ami
Steve and I jammed at the same time