centrato a milano
Resolved conflicts and added read me

Merge branch 'master' of github.com:CesareMiccio/hackzurich

# By Cesare Miccio
# Via Cesare Miccio
* 'master' of github.com:CesareMiccio/hackzurich:
  center to milano

Conflicts:
	src/com/masspeoplealfa/MainActivity.java