Merge branch 'master' of D:\WebstormProjects\CameraStore with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	css1.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	css1.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	css1.css
	index.html