merge
Merge branch 'master' of https://github.com/forflo/archfai

Conflicts:
	src/env.conf