commit
Merge branch 'master' of github.com:eurushibata/hackathon

Conflicts:
	app-firefoxOS/app.html
	app-firefoxOS/img/.DS_Store
	app-firefoxOS/index.html
	app-firefoxOS/js/map.js