Removed code to test
Added computation for normal and weighted ratings
Resolving Conflicts