Merge pull request #1 from ghhoward/master

Master - ghhoward/is210_lesson_03
Merge pull request #2 from ghhoward/is210-2014-fall-02

Merge pull request #1 from ghhoward/master