some compilation errors fixed
Merge branch 'master' of https://github.com/rajath26/cs425mp4