Commit before push to stage
Merge branch 'master' of github.com:jrodwell/ballball

Conflicts:
	wp-content/themes/ballball/functions.php