tab & grid testing
Merge branch 'master' of https://github.com/Click3X/000276_Friendshop

Conflicts:
	wp-content/themes/bones/library/css/style.css