not sure wtf i was doing
Merge branch 'list_view' of github.com:Nearhan/mood_observation into list_view

Conflicts:
	data_visulization/views.py
	mood_observation/settings.pyc
deleted twitter.json
added more stuff