ignoring ds store
:wMerge branch 'gh-pages' of https://github.com/dpwarren10/jordan-2 into gh-pages