Merge branch 'master' of https://github.com/tomrcroft/cmpe165

Conflicts:
	viewpinmodal.php