Merge branch 'master' of https://github.com/fox-squirrels-2013/phase-2-guide into tom
Merge branch 'master' of https://github.com/fox-squirrels-2013/phase-2-guide into tom
Nicked Nicole's much better formatted markdown
Updated Journal for the past few days
Merge pull request #74 from fox-squirrels-2013/tom

Tom