Data collection complete, files moved around
Merge branch 'master' of https://github.com/camerongray1515/ilwhack2014

Conflicts:
	twitter/logic.py