oops fixed small error
Merge branch 'master' of github.com:jerryhsiung/CSCI201Final