Added flag colour pallette
Fixed merge conflict re: Guest list