ommit
Merge branch 'master' of https://github.com/bouchja1/MI-VMW-music-genre-classification

Conflicts:
	MusicGenreClassification/src/cz/cvut/fit/vmw/music/Main.java