no message
Merge branch 'master' of https://github.com/yanazov/coffice2 into gh-pages

Conflicts:
	.sass-cache/3a8c933fce5f30ca99f8aab87bded3a90d0dc71c/_748.scssc
	.sass-cache/3a8c933fce5f30ca99f8aab87bded3a90d0dc71c/_960.scssc
	index.html
	sass/_748.scss
	sass/_960.scss
	styles/styles.css
no message
Merge branch 'gh-pages' of https://github.com/yanazov/coffice2 into gh-pages
Merge branch 'master' of https://github.com/yanazov/coffice2 into gh-pages

Conflicts:
	.sass-cache/3a8c933fce5f30ca99f8aab87bded3a90d0dc71c/_748.scssc
	.sass-cache/3a8c933fce5f30ca99f8aab87bded3a90d0dc71c/_960.scssc
	index.html
	sass/_748.scss
	sass/_960.scss
	styles/styles.css
Merge branch 'gh-pages' of https://github.com/yanazov/coffice2 into gh-pages