review of joining section
minor update in discussion
Merge branch 'review-Thomas'
Merge branch 'master' of https://github.com/sbenthall/i290m-ocpp-site

Conflicts:
	report/bib/references.bib