..
Merge branch 'master' of https://github.com/jonalonn/sexinsweden

Conflicts:
	index.html
..
Merge branch 'master' of https://github.com/jonalonn/sexinsweden

Conflicts:
	index.html
Merge branch 'master' of https://github.com/jonalonn/sexinsweden
changed from add-to-cart to blue-button