My stuff
Merge branch 'master' of github.com:conchulio/livemap

Conflicts:
	app.js