Steph usf branch#26

StephUSF wants to merge 2 commits intoISM6225:masterISM6225/Assignment_LookAndFeel:masterfrom

chrisleigh44:StephUSF-Branchchrisleigh44/Assignment_LookAndFeel:StephUSF-BranchCopy head branch name to clipboard