settings pagina, zitten nog buggs in
About pagina ColorTaste is gemaakt door: -> ColorTaste is produced by:
settings pagina is klaar, moet alleen nog gekoppeld worden met de
history om die te wissen en de zoeker om de kleur daar van te
veranderen.
Merge branch 'Develop' into setting

Conflicts:
	ColorTaste/bin/ColorTaste.apk
	ColorTaste/bin/classes.dex
	ColorTaste/bin/classes/com/stenden/colortaste/MainActivity$2$1.class
	ColorTaste/bin/classes/com/stenden/colortaste/MainActivity.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$drawable.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$id.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$layout.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$menu.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$string.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$style.class
	ColorTaste/bin/classes/com/stenden/colortaste/SettingsFragment$1.class
	ColorTaste/bin/classes/com/stenden/colortaste/SettingsFragment.class
	ColorTaste/bin/classes/com/stenden/colortaste/TestFragment.class
	ColorTaste/bin/resources.ap_
	ColorTaste/gen/com/stenden/colortaste/R.java
	ColorTaste/res/values/strings.xml
	ColorTaste/src/com/stenden/colortaste/SettingsFragment.java
Merge branch 'hexToString' into Develop

Conflicts:
	ColorTaste/bin/ColorTaste.apk
	ColorTaste/bin/classes.dex
	ColorTaste/bin/classes/com/stenden/colortaste/R$drawable.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$id.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$layout.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$menu.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$string.class
	ColorTaste/bin/classes/com/stenden/colortaste/R$style.class
	ColorTaste/bin/resources.ap_