First structure
Saving changes
Merged master and fixed conflicts
Datastructure for Abstract Factory Pattern
Fixed datastructure
Merged feature-factory and fixed conflicts