Merging the changes to the airline and if condition for color column.
Also adding the tags file and swo to gitignore