files
Merge branch 'gh-pages'

Conflicts:
	.idea/workspace.xml