working on the genre labels
Merge branch 'master' of github.com:mtrebell/315

Conflicts:
	MainPage.aspx
aa