Merge branch 'master' of C:\wamp\www\wp-a2 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/themes/bootstrap/style.css
cart margin