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

thomas explains it all