Merge branch 'master' of https://github.com/mkni1408/PowerViz

Conflicts:
	Filez/test.txt
asdasd