comm & actionevent
Last commit before Friday meeting, cleaning and prepp.
Merge remote-tracking branch 'upstream/master'
Merge pull request #7 from erikchalmers/master

communication loopback adress
Merge github.com:Stromner/OOAGrupp6-SP
Merge pull request #8 from HenrikChalmers/master

Server v.1
Merged GUI and Model: Client
Merge branch 'master' of github.com:Stromner/OOAGrupp6-SP
Merge github.com:Stromner/OOAGrupp6-SP
Modified Client files
Update .gitignore
Test
JSchedule update
Merge github.com:Stromner/OOAGrupp6-SP

Conflicts:
	Client/src/model/Communication.java
Merge pull request #9 from MagnusKC/master

JSchedule update
Merge github.com:Stromner/OOAGrupp6-SP
Fixed some in server and added textfile