Creating template
OpenShift merge
Merge branch 'master' of https://github.com/anaqi/bonfire
changed description in books