update
update
Merge branch 'brian' of https://github.com/Belltron/FanHype into brian

Conflicts:
	fanhype/fanhype.py
added cron job