adding to genre dictionary
minor changes to music genre
Merge branch 'master' of https://github.com/azianmike/CS_498_Project_2

Conflicts:
	GenreDictionary.py
	MusicGenreParser.py