Merge pull request #2 from xtitter/gh-pages

latest topic 2 with TODOs
Got rid of %20
Merge pull request #6 from jmca93/gh-pages

fixing topic 2 (errant space)