conflicts Merge branch 'master' of github.com:shacknetisp/fourthevaz
conflicts
Merge branch 'master' of github.com:shacknetisp/fourthevaz

Conflicts:
	evazbot/modules/m_weather.py

shacknetisp/fourthevaz,shacknetisp/fourthevaz,shacknetisp/fourthevaz