fdg
sdf
Merge branch 'master' of https://github.com/xposedbones/www

Conflicts:
	gallery/wp-content/themes/bones/index.php