Merge pull request #4 from washington1rvingjr/master

This merge should work out (I've already resolved the merge conflicts)
Conflict - Jim's side
Conflict - Jim's side (again)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	file.txt