messing with update loop
Merge branch 'master' of https://github.com/c0d3rm0nk3y/news-whore into monkeyone

Conflicts:
	harvester/timerServer.js