Adding eduar to the team
Formatting team page
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/partials/contributors.volt