update
Merge branch 'master' of https://github.com/etleung21/eric_cs_docs

Conflicts:
	README.md
update waiver request