fixed some merge errors
Merge branch 'master' of github.com:rcliao/CS-537-CSM