Changes to support multi threading
Paper Updates
Merged Michael, Updated Paper

Conflicts:
	.gitignore