Updated Map link again
updated to first version
Merge branch 'master' of https://github.com/djq/cartodb_playing

Conflicts:
	js/app.js