Add FJC to roster
Merged Jake's changes
alpha order
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