Merge pull request #5 from ghhoward/master

Ghhoward/is210 2014 fall 02
Merge pull request #6 from ghhoward/ghhoward

Merge pull request #5 from ghhoward/master