Temporary

Temp
Merge branch 'temp'

Conflicts:
	app/src/main/java/com/example/hcp/home_control_prototype/CustomList.java