added columns to schema and changed hashtag column name
added columns to schema and changed hashtag column name

 message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.