Add FJC to roster
updating published roster
Merged Jake's changes
alpha order
update slides collective action sept 6
Update roster.md
Merge branch 'master' of https://github.com/sbenthall/i290m-ocpp-site
Merge pull request #14 from serang/patch-1

Update roster.md
Merge branch 'master' of github.com:sbenthall/i290m-ocpp-site

Conflicts:
	content/pages/roster.md
Update roster.md
Merge pull request #23 from serang/patch-2

Update roster.md
merged upstream
merged changes