Adding RSVPs
Resolving conflicts

Conflicts:
	routes/views/index.js