my first commit
Merge https://github.com/magnifi-cent/magnifi-cent