kleine aanpassingen in Register
Merge branch 'master' of https://github.com/Robert048/RunForAll.git
Merge branch 'master' of https://github.com/Robert048/RunForAll.git
Kleine veranderingen
Merge branch 'master' of https://github.com/Robert048/RunForAll.git

Conflicts:
	bin/RunForAll.apk
	bin/classes.dex
	bin/resources.ap_
Json parser veranderd
Merge branch 'master' of https://github.com/Robert048/RunForAll

Conflicts:
	AndroidManifest.xml
	gen/com/example/runforall/BuildConfig.java
	res/layout/fragment_berichten.xml
	res/layout/fragment_eigen_route.xml
	res/layout/fragment_gewenste_route.xml
	res/layout/fragment_informatie_specifieke_route.xml
	res/layout/fragment_instellingen.xml
	res/layout/fragment_start.xml
	res/layout/fragment_voorgestelde_route.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/example/runforall/Berichten.java
	src/com/example/runforall/Details.java
	src/com/example/runforall/Instellingen.java
Merge branch 'master' of https://github.com/Robert048/RunForAll

Conflicts:
	AndroidManifest.xml
	gen/com/example/runforall/BuildConfig.java
	res/layout/fragment_berichten.xml
	res/layout/fragment_eigen_route.xml
	res/layout/fragment_gewenste_route.xml
	res/layout/fragment_informatie_specifieke_route.xml
	res/layout/fragment_instellingen.xml
	res/layout/fragment_start.xml
	res/layout/fragment_voorgestelde_route.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/example/runforall/Berichten.java
	src/com/example/runforall/Details.java
	src/com/example/runforall/Instellingen.java
Merge branch 'master' of https://github.com/Robert048/RunForAll

Conflicts:
	AndroidManifest.xml
	gen/com/example/runforall/BuildConfig.java
	res/layout/fragment_berichten.xml
	res/layout/fragment_eigen_route.xml
	res/layout/fragment_gewenste_route.xml
	res/layout/fragment_informatie_specifieke_route.xml
	res/layout/fragment_instellingen.xml
	res/layout/fragment_start.xml
	res/layout/fragment_voorgestelde_route.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/example/runforall/Berichten.java
	src/com/example/runforall/Details.java
	src/com/example/runforall/Instellingen.java