ljsdg
Merge branch 'master' of https://github.com/ffont/mhd2014

Conflicts:
	tasks.py