Merge pull request #4 remote-tracking branch 'jennifer/master'

Conflicts:
	README.md