some profile settings
some profile settings
some profile settings
some profile settings
.
.
.
mark product as sold after checkouot
merge broken theme
Merge branch 'master' of https://caffeinewhore@github.com/caffeinewhore/bbop.git

Conflicts:
	readme.html
	wp-activate.php
	wp-comments-post.php
	wp-config-sample.php
	wp-config.php
	wp-cron.php
	wp-load.php
	wp-login.php
	wp-mail.php
	wp-settings.php
	wp-signup.php
Merge branch 'master' of https://caffeinewhore@github.com/caffeinewhore/bbop.git

Conflicts:
	readme.html
	wp-activate.php
	wp-comments-post.php
	wp-config-sample.php
	wp-config.php
	wp-cron.php
	wp-load.php
	wp-login.php
	wp-mail.php
	wp-settings.php
	wp-signup.php
Merge branch 'master' of https://caffeinewhore@github.com/caffeinewhore/bbop.git

Conflicts:
	readme.html
	wp-activate.php
	wp-comments-post.php
	wp-config-sample.php
	wp-config.php
	wp-cron.php
	wp-load.php
	wp-login.php
	wp-mail.php
	wp-settings.php
	wp-signup.php