swag-des-pages
Merge branch 'master' of https://github.com/Steingate/wp-a2

Conflicts:
	wp-content/themes/bootstrap/style.css
Merge branch 'master' of https://github.com/Steingate/wp-a2