Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/malena/javascript-experiments into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Updated model and data array
Merge branch 'master' into gh-pages

Conflicts:
	google_maps/js/maps.view.js
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/malena/javascript-experiments into gh-pages

Conflicts:
	google_maps/js/maps.view.js
	google_maps/js/model.js
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages