taas added
Merge branch 'master' of https://github.com/code4git/mobillogix-shop

Conflicts:
	css/screen.css
	img/sprite.png
	js/main.js
	sprite.psd