ITE 254 Work
Merge branch 'master' of https://github.com/Gbarnett374/Portfolio-Projects-

Conflicts:
	project2.php