Revert "cleanup"

This reverts commit 82da2f443edc2c2e5b7193c86b731482373b2e93.
Revert "Revert "cleanup""

This reverts commit 99a34fddb5575f51bb7b8cd55213b37f78470ed3.
Merge branch 'master' of https://github.com/buggady/MelodyWebsite