Catching up with rest
Catching up
s
Revert "s"

This reverts commit fcfcd2e5e6e0befd0601e604bfcdfa56c745eb26.
Revert "Catching up"

This reverts commit 42ae7cacf7b86840b3718725e4838e6864892605.
Revert "Catching up with rest"

This reverts commit c0962ded9a87a9edfccdd22903ecbea32cf36184.
Revert "Queue Object fix"

This reverts commit 95e7dea20437c7d283e6a2fe5eddb90db72cbd57.
e
a
Merge remote-tracking branch 'origin/master'

Conflicts:
	KPSmart/src/Logic/QueueObject.java
	KPSmart/src/Logic/Statistics.java
	KPSmart/src/Tests/EventProcesserTests.java
Merge branch 'master' of https://github.com/keyaral/SwenProject.git

Conflicts:
	KPSmart/src/Logic/Statistics.java
Up to date
Merge branch 'master' of https://github.com/keyaral/SwenProject.git