oh god more conflicts
Merge branch 'master' of https://github.com/AjayTripathy/dataHub
fixed hotlink upload