a change by neil to James's fork files
deleted james_fork
Merge branch 'master' of https://github.com/jamesL88/forking_test
change by neil
Merge pull request #1 from Neilos/master

change by neil