Added Windows
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
Some Stuff
created genre.html and added side bar
Merge pull request #25 from krunalshahmo/master

added genre.html and added a side bar to the page
Merge pull request #26 from LandonVance/imgGrab

imgGrab implementation
Merge remote-tracking branch 'upstream/master' into CorrectBranch
imgGrab now keeps the largest image it finds, updated homepage to grab the imgGrab'd images
Merge pull request #27 from JakobKlinger/final_index

Final index
Merge remote-tracking branch 'upstream/master'
espnnhl
Update Project_backlog.txt
Merge pull request #28 from JakobKlinger/patch-2

Update Project_backlog.txt
Update Project_backlog.txt
Added genre.html to Main Folder
Merge pull request #29 from JakobKlinger/final_version

Added genre.html to Main Folder
Merge remote-tracking branch 'upstream/master'
Added my about us page.
Merge pull request #30 from JakobKlinger/final_version

Added my about us page.
Merge remote-tracking branch 'upstream/master'