Paul Journal entry #7
tuesday update
Merge branch 'master' of https://github.com/gopher-snakes-2013/phase-2-guide into journal