Migrating weather api to class
Merge branch 'master' of github.com:moein/wtogo
request fixed in life-comparison and city-country
merge conflicts
fixing merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.js
Now sending right status when bad things happen
Including url triggers
Merge remote-tracking branch 'origin/master'
demo db_data
Whatever
Merge remote-tracking branch 'origin/master'
Bugfixing
Bugfixing
Merge branch 'master' of https://github.com/moein/wtogo into new