.
[*] Added introduction to the new design
Fixing conflicts
Merging
Merging