rez
Merge branch 'master' of https://github.com/EpiM3/hackaton

Conflicts:
	app/index.html
v
Merge branch 'master' of https://github.com/EpiM3/hackaton
Merge branch 'master' of https://github.com/EpiM3/hackaton
Merge branch 'master' of https://github.com/EpiM3/hackaton
My version
Merge branch 'master' of https://github.com/EpiM3/hackaton
Merge branch 'master' of https://github.com/EpiM3/hackaton
Merge branch 'master' of https://github.com/EpiM3/hackaton

Conflicts:
	app/scripts/controllers/map.js
Ajout des styles (boutons)
Merge branch 'master' of https://github.com/EpiM3/hackaton

Conflicts:
	app/views/map.html
Merge branch 'master' of https://github.com/EpiM3/hackaton
iMAGEs