Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Revert 2c5cc97..2a789f2

This rolls back to commit 2c5cc97d7383bf84e2e287f243475591bb790164.
Merge branch 'master' into gh-pages

Conflicts:
	css/orderly.css
Merge branch 'master' into gh-pages

Conflicts:
	css/orderly.css
megre
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge
Merge branch 'master' into gh-pages

Conflicts:
	img/page-1.jpg
	img/page-2.jpg
	img/page-3.jpg
	img/page-5.jpg
	img/page-6.jpg
	img/page-7.jpg
rm img
Merge branch 'gh-pages'