add from branch iss1
newbranch
Merge pull request #23 from c3isecurity/newbranch

newbranch
commit from master
Merge branch 'master' into newbranch

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

Conflicts:
	test
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 remote-tracking branch 'upstream/master' into newbranch
	new file:   test1
Merge branch 'master' of https://github.com/LuisNunez/XCCDF-Remediation
Merge branch 'master' of https://github.com/LuisNunez/XCCDF-Remediation into newbranch
Merge branch 'newbranch'

Conflicts:
	test
Merge branch 'newbranch1'

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

test
Merge pull request #2 from c3isecurity/newbranch

Merge pull request #1 from c3isecurity/master
Merge branch 'master' of https://github.com/c3isecurity/XCCDF-Remediation into iss1
Revert 662fd5c..8cc6bdd

This rolls back to commit 662fd5c176154b0cfe68433b08a9e06c5093fb6e.