Changed the tweet_saver to save tweets in json format.
Merge branch 'william' of https://github.com/Belltron/FanHype into william

Conflicts:
	tweet_util/tweet_saver.py
got things from master
updated web app
twitter queries
code in html files
button change
update
update
Merge branch 'brian' of https://github.com/Belltron/FanHype into brian

Conflicts:
	fanhype/fanhype.py
added cron job
updated cron script
website is pretty sexy right now; unfinished, almost done
finished game page design, minus responsiveness
xml conversion
added jquery easing on fh bar
bulkloader.yaml added
Merge branch 'master' of https://github.com/Belltron/FanHype into brian

Conflicts:
	fanhype/app.yaml
	fanhype/fanhype.py
	fanhype/index.html
prep for merge with will
Merge branch 'william' of https://github.com/Belltron/FanHype into brian