let try this again
Merge branch 'master' of https://github.com/Nocsaron/DICCS

Conflicts:
	install.sh