final pull#4

just-kato wants to merge 4 commits into

kristha-hernandez-finalUse-My-Tech-Stuff-1/UI-1:kristha-hernandez-finalfrom

masterUse-My-Tech-Stuff-1/UI-1:masterCopy head branch name to clipboard