added a word.
Merge branch 'master' of https://github.com/mmalexander/myfirstgit

Conflicts:
	draft.txt
Added a comment