Add navbar-right
Readme
Readme
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

* upstream/gh-pages:
  Readme
  Readme
  Add navbar-right

Conflicts:
	README.md
	_includes/nav.html
	_includes/sidebar.html
	_posts/2014-07-28-introducing-shiori.md
nav-right