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

Conflicts:
	slim/app/view/userview.php
image display adjustments
file upload updates