Setting root to test directory
Merge branch 'master' of github.com:calcu16/PyPP

Conflicts:
	test/test.py