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

Conflicts:
	monitor/monitor.sh