Trying to get github to work with a simple example
Merge remote-tracking branch 'origin/master'