Small controller edit
Merge branch 'master' of https://github.com/petrock/yo-ng

Conflicts:
	app/scripts/controllers/lastfm.js