wash - change 1
wash - change 2
wash - change 3
wash - change 3
Conflict - wash's side
Conflict - washe's side (again)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	file.txt
Merge pull request #5 from washington1rvingjr/master

wash - change 1