Merge pull request #3 from JackLot/gh-pages

merge
final edits done
Merge pull request #14 from iLikeSoup/gh-pages

final version