Add something to merge
Merge branch 'master'

from https://github.com/rhew/github-training