response + request
Merge branch 'master' of https://github.com/ericsong/TrackrBot

Conflicts:
	server.js
mergeshit
Merge branch 'master' of https://github.com/ericsong/TrackrBot