Merge branch 'master' of https://github.com/mariaasp/it1901
Merge branch 'master' of https://github.com/mariaasp/it1901

Conflicts:
README.md
koier/src/koier/Login.java
koier/src/koier/TestMain.java
Slettede filer på github

Slettede filer på github
Merge branch 'master' of https://github.com/mariaasp/it1901

Conflicts:
	README.md
	koier/src/koier/Login.java
	koier/src/koier/TestMain.java
Merge branch 'master' of https://github.com/mariaasp/it1901