Base
Merge branch 'master' of https://github.com/stoarch/dis-sw

Conflicts:
	.gitignore