Test2_from user2
Merge branch 'master' of https://github.com/benwagle/swMacros

Conflicts:
	CFSetMac.txt