added pleer_caler
Merge remote-tracking branch 'origin/master'

Conflicts:
	getSongLastFm.py
added pleer_caler