Removed conflict markers and maintained the integrity of Readme.md for both pistatsview.py and pistatsd.py
Merge branch 'master' of https://github.com/rk126/pub-sub-netapp