fix for indexoutofbounds exception
Merge branch 'master' of https://github.com/yolandaw/CS410.git