javascript added and seperated and merged with marissas

Javascript should be working and merged with Marissa's media queries