Merge pull request #14 from AoteChou/master

fix the bugs
Changes to Variable Names and Methods
Merge pull request #15 from AoteChou/master

Merge origin/master
Added FIB to Exam GUI
Added FIB to Exam GUI
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/EditQuestion.java
	src/melt/View/AddQuestion.java
	src/melt/startupPanel.form
	src/melt/startupPanel.java
Merge origin/master

Conflicts:
	src/melt/View/AddQuestion.java
	src/melt/View/StartupPanel.java
Merge origin/master

Conflicts:
	src/melt/Main.java
	src/melt/Model/FIB.java
	src/melt/View/AddQuestion.java
	src/melt/View/StartupPanel.java
Added FIB to Exam GUI
Merge origin/master

Conflicts:
	src/melt/Main.java
	src/melt/Model/FIB.java
	src/melt/View/AddQuestion.java
	src/melt/View/StartupPanel.java
Merge origin/master

Conflicts:
	src/melt/Main.java
	src/melt/Model/FIB.java
	src/melt/View/AddQuestion.java
	src/melt/View/StartupPanel.java
Merge pull request #18 from allmamo/master

Added FIB to Exam GUI
Merge origin/master

Conflicts:
	src/melt/Main.java
	src/melt/Model/FIB.java
	src/melt/View/AddQuestion.java
	src/melt/View/StartupPanel.java
Merge origin/master

Conflicts:
	src/melt/Main.java
	src/melt/Model/FIB.java
	src/melt/View/AddQuestion.java
	src/melt/View/StartupPanel.java
Merge origin/master

Conflicts:
	src/melt/View/AddQuestion.java
	src/melt/View/ChooseQuestionsPanel.java
Merge origin/master

Conflicts:
	src/melt/View/AddQuestion.java
	src/melt/View/ChooseQuestionsPanel.java
Merge origin/master

Conflicts:
	src/melt/View/ExamOverview.java
Merge origin/master

Conflicts:
	src/melt/View/ExamOverview.java
Merge branch 'master' of https://github.com/AoteChou/MELT into AoteChou-master

Conflicts:
	src/melt/View/AddQuestion.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/SectionPanel_Preview.java
Merge origin/master

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/melt/DAO/MCQ_DAO.java
	src/melt/DAO/Section_DAO.java
	src/melt/View/AddQuestionFib.java
	src/melt/View/ChooseQuestionsPanel.java
	src/melt/View/Exam.java
	src/melt/View/SectionPanel_Preview.java