Initial Windows Commit
Add Makefile
Fixed conflicts
Makefile
Fixed formatting, fixed cpu model info for Windows.
Corrected getting Windows version
Fixed spacing.
Merge branch 'master' into windows

Conflicts:
	Swift2.mk
Merge branch 'windows'