Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/JadeCodes/the_bookmark_project into gh-pages

gh-pages merge with updates.
Merge branch 'gh-pages' of https://github.com/JadeCodes/the_bookmark_project into gh-pages
Merge branch 'gh-pages' of https://github.com/JadeCodes/the_bookmark_project into gh-pages

Merge fix