Merge branch 'master' of https://github.com/c3isecurity/XCCDF-Remediation into newbranch1

Conflicts:
	test
Merge branch 'master' of https://github.com/c3isecurity/XCCDF-Remediation

Conflicts:
	test
Merge branch 'newbranch'

Conflicts:
	test
Merge branch 'newbranch1'

Conflicts:
	test
Merge pull request #1 from c3isecurity/master

test