Inital Commit
Merge https://github.com/tiluu/Redesign-of-Cuteoverload