Allow user to upload their own images
Fix conflicts
Fixed conflicts
Change to JS