finish drafting
Merge branch 'master' of github.com:marshallshen/coms-4111

Conflicts:
	README.md