test proxy
Merge branch 'master' of http://github.com/Ren0/monte-carlo-pi-simulator

Conflicts:
	test.txt