Journalled for 31 Oct and 1 Nov
Merge branch 'master' of https://github.com/fox-squirrels-2013/phase-2-guide into tom
Merge pull request #54 from fox-squirrels-2013/tom

Tom