fixed merge conflicts
drug adding working
Fixed merge conflicts
Merge branch 'jimmy'