changed colors on team select page
fixed merge conflict in main