This is a test
Merge branch 'master' of https://github.com/simon0191/MinerPCAdviser

Conflicts:
	README.md