Merging updated master branch

Merge branch 'master' into basic-styling
Merge pull request #22 from gopher-snakes-2013/basic-styling

Merging updated master branch