Merge pull request #1 from johnpaulwelsh/master

Pulling master into gh-pages for iProject 2
Merge pull request #2 from johnpaulwelsh/gh-pages

Merge pull request #1 from johnpaulwelsh/master