Consolidating the attendance toggle
Resolving conflicts

Conflicts:
	public/styles/site.min.css
	templates/mixins/meetup.jade