Merge pull request #1 from TCortez/gh-pages

merging
Merge pull request #2 from TCortez/gh-pages

ugghghh
Merge pull request #3 from TCortez/gh-pages

again
Merge pull request #4 from TCortez/gh-pages

almost done
Merge pull request #5 from TCortez/master

stupid git