modified at laptop for merge
Merge branch 'master' of https://github.com/ofirENS/GeneralTheory

Conflicts:
	Theory of Polymer Dynamics/Theory Of Polymer Dynamics.log
	Theory of Polymer Dynamics/Theory Of Polymer Dynamics.pdf
	Theory of Polymer Dynamics/Theory Of Polymer Dynamics.synctex.gz