conflict between js library fixed
Merge branch 'master' of https://github.com/Ant-keke/YoungSkilledCMS