commit
Merge branch 'jason' of https://github.com/Belltron/FanHype into william
commit
done for the night
Merge branch 'william' into jason

Conflicts:
	fanhype/fanhype.py
	fanhype/game.html
	tweet_util/post_tweet.py