Initial commit
Merge branch 'develop'
adressed merge conflicts from remote and local readme file

Merge branch 'master' of https://github.com/environmentalinformatics-marburg/remote

Conflicts:
	README.md
cleaned large text in readme
Merge branch 'develop'
Update README.md

changed name in readme
Merge branch 'master' into develop