Paul Journal Day 5
Merge branch 'master' of https://github.com/gopher-snakes-2013/phase-2-guide

Pulling the latest version.