function_exists check added for theme_styles and theme_js - this will allow to overwrite those functions in the child theme
Merge branch 'master' of https://github.com/smartfoxes/wordpress-bootstrap

Conflicts:
	functions.php