Was basically a boss, but yall know that
Merge branch 'invites'

Conflicts:
	app/views/static_pages/notifications.html.erb