- setting 300 images for first show
Merge branch 'develop'

Conflicts:
	server.js