Gui
gui
Commit na groepswerk
tezt
reezse
6/12 update

groepswerk 6/12
Merge branch 'developer' of https://github.com/TamoMaez/Competentietester into developer

Conflicts:
	bin/controller/AdminModeAction.class
Merge remote-tracking branch 'origin/developer'

Conflicts:
	bin/.gitignore
	bin/application/CompetentieTesterApp.class
	bin/controller/AbstractTestAction.class
	bin/controller/AbstractTestMouseAdapter.class
	bin/controller/CategoryDoneAction.class
	bin/controller/CategoryEditAction.class
	bin/controller/CategoryNewAction.class
	bin/controller/CategoryOverviewAction.class
	bin/controller/UserTypeDoneAction.class
	bin/database/FileManager.class
	bin/database/FileReader.class
	bin/database/FileWriter.class
	bin/database/ReadFromExcel.class
	bin/database/WriteToExcel.class
	bin/domain/Answer.class
	bin/domain/Category.class
	bin/domain/CompareByTimesAsked.class
	bin/domain/DomainException.class
	bin/domain/Feedback.class
	bin/domain/FeedbackType.class
	bin/domain/MCAnswer.class
	bin/domain/MCQuestion.class
	bin/domain/Option.class
	bin/domain/Question.class
	bin/domain/QuestionAnswerType.class
	bin/domain/QuestionTest.class
	bin/domain/QuestionType.class
	bin/domain/Score.class
	bin/domain/ScoreFeedback.class
	bin/domain/YesNoAnswer.class
	bin/domain/YesNoQuestion.class
	bin/domain/facade/AdministratorFacade.class
	bin/domain/facade/CompetentieTesterFacade.class
	bin/domain/facade/UserFacade.class
	bin/domain/factory/AnswerFactory.class
	bin/domain/factory/FeedbackFactory.class
	bin/domain/factory/QuestionFactory.class
	bin/domain/questionSelectorStrategy/LeastAskedSelector.class
	bin/domain/questionSelectorStrategy/QuestionSelector.class
	bin/domain/questionSelectorStrategy/RandomMCSelector.class
	bin/domain/questionSelectorStrategy/RandomSelector.class
	bin/domain/questionSelectorStrategy/RandomYesNoSelector.class
	bin/domain/scoreCalculatorStrategy/GisScoreCalculator.class
	bin/domain/scoreCalculatorStrategy/ScoreCalculator.class
	bin/domain/scoreCalculatorStrategy/SumScoreCalculator.class
	bin/domain/scoreCalculatorStrategy/TimeScoreCalculator.class
	bin/view/MainView.class
	bin/view/ViewException.class
	bin/view/panels/CategoryDetailPanel.class
	bin/view/panels/CategoryOverviewPanel.class
	bin/view/panels/CategoryTableModel.class
	bin/view/panels/MessagePanel.class
	bin/view/panels/WelcomePanel.class