New features part 1
Merge branch 'master' of github.com:SaumyaB/Branching into r2_features
remaining changes
Merge branch 'master' into r2_features
Final coding complete by team 2