added a module
newlines korrigiert
more modules
correction of modules
fix modules
fixfix
fixfix
resolved conflict in modules.json
Merge branch 'master' of https://github.com/Dissem/ISA-Mockup

Conflicts:
	api/modules.json