git-ignore
Merge branch 'master' of github.com:pulse-than/Word

Conflicts:
	.gitignore
w