second commit
second commit. not completely finished yet
Merge pull request #1 from joetamburro/master

Merging master and gh-pages