tara
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/app/Informations.java
	app/src/main/res/layout/informationtext.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/app/Informations.java
	app/src/main/res/layout/informationtext.xml