initial commit
first commit on windows 7
merge