man day photos added
Merge branch 'master' of https://github.com/josephmadden/Web-Joseph-Madden

Conflicts:
	video.php