More skelington.
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.
deleted bin-files
Merge pull request #6 from cthsvedani/master

deleted bin-files
Fixed merge