changed config
Merge branch 'master' of https://github.com/Lyr3x/Jarvis

Conflicts:
	jarvis.rb