Subject chorradilla
Merged subjects.py
Merged subjects.py again
Merge branch 'master' of https://github.com/javicps/tallergit