update journal
Merge branch 'master' of https://github.com/gopher-snakes-2013/phase-2-guide into journal
Merge pull request #105 from gopher-snakes-2013/journal

Journal