blabla nothing special /bin/ and shizzle
Merge branch 'master' of https://github.com/tanevanwifferen/HumanTechnologyInteraction
no idea what I am doing

Conflicts:
	bin/classes/android/support/v7/appcompat/R$anim.class
	bin/classes/android/support/v7/appcompat/R$attr.class
	bin/classes/android/support/v7/appcompat/R$bool.class
	bin/classes/android/support/v7/appcompat/R$color.class
	bin/classes/android/support/v7/appcompat/R$dimen.class
	bin/classes/android/support/v7/appcompat/R$drawable.class
	bin/classes/android/support/v7/appcompat/R$id.class
	bin/classes/android/support/v7/appcompat/R$integer.class
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/android/support/v7/appcompat/R$string.class
	bin/classes/android/support/v7/appcompat/R$style.class
	bin/classes/android/support/v7/appcompat/R$styleable.class
	bin/classes/android/support/v7/appcompat/R.class
	bin/classes/com/example/thermostatapp/AddSwitchesToScrollViewAdapter$1.class
	bin/classes/com/example/thermostatapp/AddSwitchesToScrollViewAdapter.class
	bin/classes/com/example/thermostatapp/BuildConfig.class
	bin/classes/com/example/thermostatapp/Home$1.class
	bin/classes/com/example/thermostatapp/Home$GetTemperature.class
	bin/classes/com/example/thermostatapp/Home$PutWeekProgramState.class
	bin/classes/com/example/thermostatapp/Home.class
	bin/classes/com/example/thermostatapp/ManageThermostat$1.class
	bin/classes/com/example/thermostatapp/ManageThermostat$2.class
	bin/classes/com/example/thermostatapp/ManageThermostat$3.class
	bin/classes/com/example/thermostatapp/ManageThermostat$GetTemperature.class
	bin/classes/com/example/thermostatapp/ManageThermostat$PutTemperature.class
	bin/classes/com/example/thermostatapp/ManageThermostat.class
	bin/classes/com/example/thermostatapp/ManageWeekProgram$1.class
	bin/classes/com/example/thermostatapp/ManageWeekProgram$2.class
	bin/classes/com/example/thermostatapp/ManageWeekProgram.class
	bin/classes/com/example/thermostatapp/Overview$1.class
	bin/classes/com/example/thermostatapp/Overview$2.class
	bin/classes/com/example/thermostatapp/Overview$GetWeekProgram.class
	bin/classes/com/example/thermostatapp/Overview$PutWeekProgram.class
	bin/classes/com/example/thermostatapp/Overview$TimePickerFragment.class
	bin/classes/com/example/thermostatapp/Overview.class
	bin/classes/com/example/thermostatapp/R$anim.class
	bin/classes/com/example/thermostatapp/R$attr.class
	bin/classes/com/example/thermostatapp/R$bool.class
	bin/classes/com/example/thermostatapp/R$color.class
	bin/classes/com/example/thermostatapp/R$dimen.class
	bin/classes/com/example/thermostatapp/R$drawable.class
	bin/classes/com/example/thermostatapp/R$id.class
	bin/classes/com/example/thermostatapp/R$integer.class
	bin/classes/com/example/thermostatapp/R$layout.class
	bin/classes/com/example/thermostatapp/R$menu.class
	bin/classes/com/example/thermostatapp/R$string.class
	bin/classes/com/example/thermostatapp/R$style.class
	bin/classes/com/example/thermostatapp/R$styleable.class
	bin/classes/com/example/thermostatapp/R.class
	bin/classes/com/example/thermostatapp/SeekbarChangeListener$PutTemperature.class
	bin/classes/com/example/thermostatapp/SeekbarChangeListener.class
	bin/classes/com/example/thermostatapp/SplashScreen$PrefetchData.class
	bin/classes/com/example/thermostatapp/SplashScreen.class
	bin/classes/org/thermostatapp/util/CorruptWeekProgramException.class
	bin/classes/org/thermostatapp/util/HeatingSystem.class
	bin/classes/org/thermostatapp/util/InvalidInputValueException.class
	bin/classes/org/thermostatapp/util/Switch.class
	bin/classes/org/thermostatapp/util/WeekProgram.class
fixed push to server in tabview
Merge branch 'master' of https://github.com/tanevanwifferen/HumanTechnologyInteraction