added bootstrap dropdown to nav
deleted popcorn
merge conflict resolved
add style to main page
merge conflict
trying to impliment jplayer