added another sentiment dictionary and last char to main.py
fixed merge conflicts