made change
Merge branch 'master' of https://github.com/rh482/myfirstgit

Change is okay

Conflicts:
	draft.txt
change