updated
Merge branch 'master' of github.com:alex-wyc/APCSFinalProject

Conflicts:
	README.md