commit all these files
Merge branch 'master' of https://github.com/torresma/MileageConverter

Conflicts:
	README.md
I am committing a merge