add edge category, update readme
add pos/neg emoticon lists
add edge category, update readme
add pos/neg emoticon lists

Conflicts:
	preprocess/make_hashtag_graphs.py
Merge branch 'master' into preprocess