Grundlayout und Grundfunktionen Restaurant implementiert
fehlen: aktueller Wechselkurs, shuffle button, Hintergrundbild
Merge remote-tracking branch 'origin/master'

Conflicts:
	USASurvivalApp/gen/com/example/usasurvivalapp/R.java
ignore4
Merge remote-tracking branch 'choose_remote_name/BranchJasmin'

Conflicts:
	USASurvivalApp/bin/classes/com/example/usasurvivalapp/MainActivity.class
	USASurvivalApp/bin/classes/com/example/usasurvivalapp/R$id.class
	USASurvivalApp/bin/classes/com/example/usasurvivalapp/R$layout.class
	USASurvivalApp/bin/classes/com/example/usasurvivalapp/R$menu.class
	USASurvivalApp/bin/classes/com/example/usasurvivalapp/R$string.class
	USASurvivalApp/bin/classes/com/example/usasurvivalapp/R$style.class
	USASurvivalApp/bin/classes/com/example/usasurvivalapp/RestaurantFragment.class
	USASurvivalApp/src/com/example/usasurvivalapp/FindGasStationActivity.java