first commit
Merge branch 'master' of https://github.com/markthethomas/git_fun_iain