update list_group.xml
update list_group.xml
Got rid of that fucking puller class
update list_group.xml
Merge remote-tracking branch 'origin/UI_Testing_Jeffrey' into UI_Testing_Jeffrey
update list_group.xml
update list_group.xml
Merge branch 'UI_Testing_Jeffrey' of /home/jeffrey/Programming/KitchenSync with conflicts.
Connected Spinner to List view
Changed colors to use resources
Okay
Merge branch 'UI_Testing_Jeffrey' of https://github.com/NaOHman/KitchenSync into UI_Testing_Jeffrey

Conflicts:
	.idea/workspace.xml
	res/layout/list_group.xml
	target/classes/KitchenSync.apk
	target/classes/KitchenSync.unaligned.apk
merged UI_Testing_Jeffrey on march 7