initial commit for github
solve conflict
Merge https://github.com/IEK-5/ModuleSim

Conflicts:
	README.md
conflict