Merge pull request #205 from AJRenold/master

improvements and fixes in the organization section
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
added draft table of contents
corrected latex typo
assignment 7 submission for tony chen: modularity and contributions
Merge pull request #209 from chilldude/master

assignment 7 submission for tony chen: modularity and contributions
fixed funny chars in funding
fixed more funny chars in funding
stuburn little guys
last one
Merge pull request #210 from fchasen/master

fixed funny quote chars in funding
First try on conclusions
Future RQs as part of the main file
Improved merging of this to other conclusions
re-writing beginning of organizing section
merged upstream