Lagd login
Merge branch 'Dev' of https://github.com/TeamTobb/Dagsverket into Dev

Conflicts:
	Dagsverket/src/dagsverket.form
	Dagsverket/src/dagsverket.java
Fiksa
Revert 0831a9b..793ddae

This rolls back to commit 0831a9b04f5f28c2cf0e90baa98d3e2202a8ea9c.
Merge branch 'Dev' of https://github.com/TeamTobb/Dagsverket into Dev

Conflicts:
	Dagsverket/src/Login.form
	Dagsverket/src/Login.java
	Dagsverket/src/dagsverket.form
	Dagsverket/src/dagsverket.java
ingnor
WTF
Merge branch 'Dev' of https://github.com/TeamTobb/Dagsverket into Dev

Conflicts:
	Dagsverket/src/dagsverket.java
Revert "Lagd login"

Conflicts:
	Dagsverket/src/Login.form
	Dagsverket/src/Login.java
	Dagsverket/src/dagsverket.form
	Dagsverket/src/dagsverket.java
Revert "WTF"

This reverts commit 671a0fb2702c348ecf0ad32486f5bd3a44dfe14e.
Revert 0831a9b..f19c260

This rolls back to commit 0831a9b04f5f28c2cf0e90baa98d3e2202a8ea9c.
Revert f19c260..9a4c22d

This rolls back to commit f19c26032f2529be2015546b40f6d586dbfc0b19.
Skrivefeil endret

Endret skrivefeil
skriveleif
Nu fungerer alt

14:16
Merge branch 'Dev' into Jørgen