Startup Collage etc...
Merge branch 'master' of https://github.com/DataAnalyticsinStudentHands/PublicArtApp

Conflicts:
	www/partials/imageSlider.html
Merge branch 'master' of https://github.com/DataAnalyticsinStudentHands/PublicArtApp into dev_carl