commit before pull
Merge branch 'master' of https://github.com/gregorytkach/page-proofs

Conflicts:
	.idea/workspace.xml