asdf
asdf
Merge branch 'master' of github.com:donjan/compelectromag

Conflicts:
	code/ball_naive.edp
	testing/product_rule.edp
merge mylonasc