paula y chichi
Merge branch 'master' of https://github.com/pablohe/ctpython

Conflicts:
	exercise/todosTocan.txt
Merge branch 'master' of https://github.com/pablohe/ctpython
Merge branch 'master' of https://github.com/pablohe/ctpython
Subimos programita py Chichi y Pau
SRP.py
Merge branch 'master' of https://github.com/pablohe/ctpython

Conflicts:
	exercise/SRP.py