include paperclip gem + add media file to spots
seperate js file for media
merge and resolve conflict