Merge branch 'master' of https://github.com/k4rthikv/IR670-Project