update to design
Merge branch 'master' of https://github.com/mmollica/Capstone_Project

Conflicts:
	viewuserdetails.php
	viewusers.php