Gjort en del på del 1.2, borde vara halvklar om det funkar som jag tror att det ska
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/freha_tddd13/lab1/MainActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/freha_tddd13/lab1/MainActivity_2.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/freha_tddd13/lab1/MainActivity.java
Merge remote-tracking branch 'origin/master'
Final del 3