Initial commit
Fixes
Merge branch 'master' of https://github.com/sfeilmeier/fems

Conflicts:
	.gitignore