Testing automated pages commit
push
Submodule commit
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore