huhu
Merge branch 'master' of https://github.com/hcrudolph/swe-model

Conflicts:
	README.md
Merge branch 'master' of https://github.com/hcrudolph/swe-model