Progress

Fixed the menu hover, added icons, parsed the JSON file
Merge remote-tracking branch 'origin/master'

Conflicts:
	CS490WD_Project1/nbproject/private/private.xml
	CS490WD_Project1/public_html/images/movies/Blue-Streak.jpg
	CS490WD_Project1/public_html/images/movies/doubt_fire.jpg
	CS490WD_Project1/public_html/images/movies/life_of_pi.jpg
	CS490WD_Project1/public_html/images/movies/pacific.jpg
	CS490WD_Project1/public_html/images/movies/prince_and_me.jpg
	CS490WD_Project1/public_html/images/movies/rio.jpg
	CS490WD_Project1/public_html/images/movies/unfinished_life.jpg
	CS490WD_Project1/public_html/images/movies/woman_in_black.jpg
	CS490WD_Project1/public_html/images/movies/world_war_z.jpg
	CS490WD_Project1/public_html/style/website.css
	nbproject/project.properties
	public_html/index.html