changes
Merge branch 'master' into gh-pages

Conflicts:
	_config.yml
abstractmint
another
Changes are made
Merge branch 'gh-pages'
There is another commit
Merge branch 'gh-pages'
Commit