edit setup.py
add new file
Merge branch 'master' of https://github.com/hp15071hp/Parallelization

Conflicts:
	setup.py