Update README.md
Update README.md
Update README.md
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Update .travis.yml
Merge pull request #14 from ron-burgundy1/master

Fixed merge issue