Added gitignore
merging
Merge branch 'master' of https://github.com/AndreaGiardini/cern-maps into AndreaGiardini-master

Conflicts:
	bin/AndroidManifest.xml
	bin/CERNmaps.apk
	bin/classes.dex
	bin/classes/ch/cern/maps/GenerateHTMLContent.class
	bin/classes/ch/cern/maps/StartActivity$1.class
	bin/classes/ch/cern/maps/StartActivity$10.class
	bin/classes/ch/cern/maps/StartActivity$11.class
	bin/classes/ch/cern/maps/StartActivity$2.class
	bin/classes/ch/cern/maps/StartActivity$3.class
	bin/classes/ch/cern/maps/StartActivity$4.class
	bin/classes/ch/cern/maps/StartActivity$5.class
	bin/classes/ch/cern/maps/StartActivity$6.class
	bin/classes/ch/cern/maps/StartActivity$7.class
	bin/classes/ch/cern/maps/StartActivity$8.class
	bin/classes/ch/cern/maps/StartActivity$9.class
	bin/classes/ch/cern/maps/StartActivity$SensorsReceiver.class
	bin/classes/ch/cern/maps/geo/LocationService$LocationListener.class
	bin/classes/ch/cern/maps/geo/LocationService.class
	bin/classes/ch/cern/maps/geo/OrientationService.class
	bin/classes/ch/cern/maps/services/DialogBox.class
	bin/classes/ch/cern/maps/services/MapScroller.class
	bin/classes/ch/cern/maps/utils/Building.class
	bin/classes/ch/cern/maps/utils/Constants.class
	bin/classes/ch/cern/maps/utils/JSONParser.class
	bin/classes/ch/cern/maps/utils/Trams.class
	bin/classes/ch/cern/maps/utils/Utils.class
	bin/classes/ch/cern/www/BuildConfig.class
	bin/classes/ch/cern/www/R$attr.class
	bin/classes/ch/cern/www/R$color.class
	bin/classes/ch/cern/www/R$dimen.class
	bin/classes/ch/cern/www/R$drawable.class
	bin/classes/ch/cern/www/R$id.class
	bin/classes/ch/cern/www/R$layout.class
	bin/classes/ch/cern/www/R$string.class
	bin/classes/ch/cern/www/R$style.class
	bin/classes/ch/cern/www/R.class
	bin/dexedLibs/android-support-v4-3bcd5ed133ade1f35f94bbd37d47160e.jar
	bin/resources.ap_
Merge branch 'AndreaGiardini-master'