image place holders in device learnmore
conflict resolved

Conflicts:
	css/stylesheet.css
	device.html