edit
Merge branch 'master' of https://github.com/Broeiend/wp-theme-bone

Conflicts:
	readme.md