asdasd
Merge branch 'master' of https://github.com/khlieng/AndroidOblig4

Conflicts:
	Oblig4_1/src/com/snyskuter/oblig4_1/TemperatureService.java