minor changes

@Shweta: If these are conflicting with your changes, mujhe batana..I'll
remove those from mine.
Merge branch 'master' of https://github.com/ShwetaSeth/cmpe281team5