initial commit.
Initial commit

Conflicts:
	.gitignore

	modified:   .gitignore
initial commit