Upload photo
Merge branch 'master' of https://github.com/bkerickson/ssl_lab7

Conflicts:
	slim/public/index.php