Merge branch 'master' into master_nick
Merge branch 'master_nick' of https://github.com/nicholasyoon90/Good-Pet-UI-Revamp into master_nick
Everything I changeed so far