Gitignore uppdaterad
Merge pull request #3 from HenrikChalmers/master

Gitignore uppdaterad
testgh.txt skapad
Please enter the commit message for your changes. Lines starting
Börjat lägga till metoder i Server
More skelington.
Merge pull request #4 from HenrikChalmers/master

Skapad testa pull request på 2 av samma.
Delete testgh.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server/bin/Main.class
Merge Master - Erik
Fixed conflicting issues between Master and Erik-Master
Polished view folder.
More methods defined in 'view' package.
V.1 of log in screen.
V.2 of log in screen, uses gridbaglayout now.
V2.1 of log in screen, added labels.
Testcommit textfil
Z