assignment2 solved
pa2 solved
fix conflict in term_sentiment.py