ep entregue
Merge branch 'master' of https://github.com/hinokakera/mac300ep3

Conflicts:
	README