Fixing issues
Merge branch 'master' of github.com:prajwal-y/CMU_15-513