Fixed error when resetting search
I didn't actually change anything
Merge branch 'master' of https://github.com/GodOfGingers/SLU_Software_Engineering_Group_A

Conflicts:
	sample.db
Fixed tweet search reset
Changed error catching while searching
Moved server actions to tweetcache
Fix problem of overlapping tweets, Add basic server interaction
Merge branch 'master' of https://github.com/AaronTR/SLU_Software_Engineering_Group_A

Conflicts:
	get_tweets.py
Merge pull request #21 from AaronTR/master

Fixed search error and overlapping tweet problem
tweet-trender update

handles pulls, still working on pushing back sentiment info
merge conflict resolution