Pinit last version met aankilbare / niet functionele pinnetjes
Merge branch 'master' of https://github.com/Tunder1992/INF1B

Conflicts:
	ShaVar/Main/gen/com/example/myasynctask/R.java
	ShaVar/Main/res/layout/weather_block.xml
	ShaVar/Main/res/layout/weather_block_phone.xml
	ShaVar/Main/src/com/stenden/pinit/Overview.java