Revert "from boda"

This reverts commit 10e1e12a96b694eda5a00846f1c05f1cafd0f3b9.

Conflicts:
	README.md
navy
Merge branch 'master' of https://github.com/glzjuer/EECS-394

Conflicts:
	README.md
aa