what?
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
abc
Merge branch 'master' into gh-pages
everything now
Merge branch 'master' into gh-pages