modified:   XCCDF-dev/xccdf_dev.xsd
	modified:   .gitignore
	modified:   XCCDF-dev/xccdf_dev.xsd
	modified:   XCCDF1.2/win7stig_xccdf.xml
Merge pull request #25 from LuisNunez/dev

Dev
Merge branch 'master' of https://github.com/LuisNunez/XCCDF-Remediation

Conflicts:
	XCCDF-dev/xccdf_dev.xsd