initial commit
typo

Conflicts:
	.gitignore