Pregunta OO.
Events
Merge branch 'features' of https://github.com/degva/TrabajoAvatar into features

Conflicts:
	json/event1.json
	json/event2.json