?
Merge branch 'master' into gh-pages

Conflicts:
	.idea/workspace.xml
added zip file
Merge branch 'gh-pages'