Merge origin/master

Conflicts:
	.gitignore
	nbproject/project.properties
	src/melt/AddQuestion.form
	src/melt/AddQuestion.java
	src/melt/Main.java
	src/melt/Question.java
	src/melt/QuestionTableModel.java
Merge origin/master

Conflicts:
	.gitignore
	nbproject/project.properties
	src/melt/AddQuestion.form
	src/melt/AddQuestion.java
	src/melt/Main.java
	src/melt/Question.java
	src/melt/QuestionTableModel.java
Merge pull request #4 from AoteChou/master

modify and add
Merge origin/master

Conflicts:
	.gitignore
	nbproject/project.properties
	src/melt/AddQuestion.form
	src/melt/AddQuestion.java
	src/melt/Main.java
	src/melt/Question.java
	src/melt/QuestionTableModel.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/AddQuestion.form
	src/melt/AddQuestion.java
	src/melt/DAO/MCQOption_DAO.java
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/QuestionDAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/EditQuestion.java
	src/melt/Main.java
	src/melt/Model/MCQ.java
	src/melt/Model/MCQOption.java
	src/melt/Model/Question.java
	src/melt/Model/Section.java
	src/melt/Model/SubSection.java
	src/melt/QuestionTableModel.java
	src/melt/Util/jdbc.properties
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/MCQPanel.java
	src/melt/View/SubsectionPanel.java
	src/melt/startupPanel.form
	src/melt/startupPanel.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/AddQuestion.form
	src/melt/AddQuestion.java
	src/melt/DAO/MCQOption_DAO.java
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/QuestionDAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/EditQuestion.java
	src/melt/Main.java
	src/melt/Model/MCQ.java
	src/melt/Model/MCQOption.java
	src/melt/Model/Question.java
	src/melt/Model/Section.java
	src/melt/Model/SubSection.java
	src/melt/QuestionTableModel.java
	src/melt/Util/jdbc.properties
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/MCQPanel.java
	src/melt/View/SubsectionPanel.java
	src/melt/startupPanel.form
	src/melt/startupPanel.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/AddQuestion.form
	src/melt/AddQuestion.java
	src/melt/DAO/MCQOption_DAO.java
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/QuestionDAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/EditQuestion.java
	src/melt/Main.java
	src/melt/Model/MCQ.java
	src/melt/Model/MCQOption.java
	src/melt/Model/Question.java
	src/melt/Model/Section.java
	src/melt/Model/SubSection.java
	src/melt/QuestionTableModel.java
	src/melt/Util/jdbc.properties
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/MCQPanel.java
	src/melt/View/SubsectionPanel.java
	src/melt/startupPanel.form
	src/melt/startupPanel.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/AddQuestion.form
	src/melt/AddQuestion.java
	src/melt/DAO/MCQOption_DAO.java
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/QuestionDAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/EditQuestion.java
	src/melt/Main.java
	src/melt/Model/MCQ.java
	src/melt/Model/MCQOption.java
	src/melt/Model/Question.java
	src/melt/Model/Section.java
	src/melt/Model/SubSection.java
	src/melt/QuestionTableModel.java
	src/melt/Util/jdbc.properties
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/MCQPanel.java
	src/melt/View/SubsectionPanel.java
	src/melt/startupPanel.form
	src/melt/startupPanel.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/AddQuestion.form
	src/melt/AddQuestion.java
	src/melt/DAO/MCQOption_DAO.java
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/QuestionDAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/EditQuestion.java
	src/melt/Main.java
	src/melt/Model/MCQ.java
	src/melt/Model/MCQOption.java
	src/melt/Model/Question.java
	src/melt/Model/Section.java
	src/melt/Model/SubSection.java
	src/melt/QuestionTableModel.java
	src/melt/Util/jdbc.properties
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/MCQPanel.java
	src/melt/View/SubsectionPanel.java
	src/melt/startupPanel.form
	src/melt/startupPanel.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/AddQuestion.form
	src/melt/AddQuestion.java
	src/melt/DAO/MCQOption_DAO.java
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/QuestionDAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/EditQuestion.java
	src/melt/Main.java
	src/melt/Model/MCQ.java
	src/melt/Model/MCQOption.java
	src/melt/Model/Question.java
	src/melt/Model/Section.java
	src/melt/Model/SubSection.java
	src/melt/QuestionTableModel.java
	src/melt/Util/jdbc.properties
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/MCQPanel.java
	src/melt/View/SubsectionPanel.java
	src/melt/startupPanel.form
	src/melt/startupPanel.java
Merge origin/master
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/AddQuestion.form
	src/melt/AddQuestion.java
	src/melt/DAO/MCQOption_DAO.java
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/QuestionDAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/EditQuestion.java
	src/melt/Main.java
	src/melt/Model/MCQ.java
	src/melt/Model/MCQOption.java
	src/melt/Model/Question.java
	src/melt/Model/Section.java
	src/melt/Model/SubSection.java
	src/melt/QuestionTableModel.java
	src/melt/Util/jdbc.properties
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/MCQPanel.java
	src/melt/View/SubsectionPanel.java
	src/melt/startupPanel.form
	src/melt/startupPanel.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/AddQuestion.form
	src/melt/AddQuestion.java
	src/melt/DAO/MCQOption_DAO.java
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/QuestionDAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/EditQuestion.java
	src/melt/Main.java
	src/melt/Model/MCQ.java
	src/melt/Model/MCQOption.java
	src/melt/Model/Question.java
	src/melt/Model/Section.java
	src/melt/Model/SubSection.java
	src/melt/QuestionTableModel.java
	src/melt/Util/jdbc.properties
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/MCQPanel.java
	src/melt/View/SubsectionPanel.java
	src/melt/startupPanel.form
	src/melt/startupPanel.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/AddQuestion.form
	src/melt/AddQuestion.java
	src/melt/DAO/MCQOption_DAO.java
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/QuestionDAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/EditQuestion.java
	src/melt/Main.java
	src/melt/Model/MCQ.java
	src/melt/Model/MCQOption.java
	src/melt/Model/Question.java
	src/melt/Model/Section.java
	src/melt/Model/SubSection.java
	src/melt/QuestionTableModel.java
	src/melt/Util/jdbc.properties
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/MCQPanel.java
	src/melt/View/SubsectionPanel.java
	src/melt/startupPanel.form
	src/melt/startupPanel.java
Added Student UI
Merge pull request #7 from allmamo/master

Changed Exam UI
Merge origin/master

Conflicts:
	src/melt/DAO/MCQOption_DAO.java
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/Question_DAO.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/Exam.java
	src/melt/View/ExamOverview.java
	src/melt/View/MCQPanel.java
	src/melt/View/SubsectionPanel.java