resolved conflicts|manigann,melanie
Merge branch 'master' of https://github.com/AbhilashTw/Mafia
Merge branch 'master' of https://github.com/AbhilashTw/Mafia
solved the conflicts in first cut|mani,melanie