Updated image gallery
Merge branch 'master' of https://github.com/viciousmelicious/FEWD_GITHUB_38_melv

Conflicts:
	Slideshow_Example/img/angry_cat_1.jpg
	Slideshow_Example/img/angry_cat_2.jpg
	Slideshow_Example/img/angry_cat_3.jpg
	Slideshow_Example/img/angry_cat_4.jpg
	Slideshow_Example/js/main.js
uploading latest changes
attempting to upload slideshow again