Search functionaliteit afgemaakt
Buildconfig
Gitignore
Testcommit
Merge branch 'master' of https://github.com/TimovNiedek/ResDev

Conflicts:
	HotMeals/TabTest/bin/TabTest.apk
	HotMeals/TabTest/bin/classes.dex

	HotMeals/TabTest/bin/classes/android/support/v7/appcompat/R$layout.class
	HotMeals/TabTest/bin/classes/com/example/tabtest/R$id.class
	HotMeals/TabTest/bin/classes/com/example/tabtest/R$integer.class
	HotMeals/TabTest/bin/classes/com/example/tabtest/R$layout.class
	HotMeals/TabTest/bin/classes/com/example/tabtest/R$menu.class
	HotMeals/TabTest/bin/classes/com/example/tabtest/R$string.class
	HotMeals/TabTest/bin/classes/com/example/tabtest/R$style.class
	HotMeals/TabTest/bin/classes/com/example/tabtest/R$styleable.class
	HotMeals/TabTest/bin/resources.ap_