merge
Merge branch 'master' of https://github.com/brunocascio/sdl-python-e1

Conflicts:
	entrega.py
Merge branch 'master' of https://github.com/brunocascio/sdl-python-e1

Conflicts:
	entrega.py
Merge branch 'master' of https://github.com/brunocascio/sdl-python-e1

Conflicts:
	entrega.py
Merge branch 'master' of https://github.com/brunocascio/sdl-python-e1

Conflicts:
	entrega.py
Merge branch 'master' of https://github.com/brunocascio/sdl-python-e1