todo
Merge branch 'master' of https://github.com/ph03n1xch1ld/environment_monitoring

Conflicts:
	TODO.list