strange commit for gh-pages...
strange commit in gh-pages cont.
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	.idea/workspace.xml