Misc. changes
Merge branch 'master' of https://github.com/moustachio/lastfm-Analysis

Conflicts:
	.gitignore