resolve assets issue
Merge branch 'master' of https://github.com/3lackRos3/Hackathon