Updated other files
Ignore docfile
Edit a word
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md