Changes in weak formulation
Merge branch 'master' of github.com:Paulie14/ESCOarticle_xfem

Conflicts:
	2014_ESCO_article/esco_article.tex