RAY-NOT OVER YET
Merge branch 'master' of github.com:cdrexle/CS343-A6