images are now loaded from image folder via php
Merge branch 'master' of https://github.com/debd/kinect-carousel

Conflicts:
	client/img/1/1.jpg
	client/js/lib.js