Small changes to first half of paper.
Moved one web link from document to bib file
Fixed conflicts

Merge branch 'master' of https://github.com/danielskatz/WSSSPE

Conflicts:
	WSSSPE1_report/WSSSPE1_summary_report.tex