Merge branch 'bootstrap3' of https://github.com/simonyeldon/bootstrap-shortcodes

Conflicts:
	README.md
	bootstrap-shortcodes.php