This has been deleted
Merge branch 'master' of https://github.com/matteomenapace/rave-WEB14203

Conflicts:
	students/simeron/IMG_2817.JPG