test
Merge branch 'master' of https://github.com/EECS556/EECS556_code

Conflicts:
	README.md