Update Main.java
Basic settings and finish the login part
Basic settings and finish the login part
Merge pull request #1 from AoteChou/master

#1 basic finished login part
Merge pull request #2 from allmamo/master

Student UI
add edit and delete functions
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/Main.java
	src/melt/Question.java
	src/melt/QuestionDAO.java
Implement of add Exam and set Exam
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/Main.java
	src/melt/Question.java
	src/melt/QuestionDAO.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/Main.java
	src/melt/Question.java
	src/melt/QuestionDAO.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/Main.java
	src/melt/Question.java
	src/melt/QuestionDAO.java
remove addQuestion.form and addQuestion.java
Merge branch 'master' of https://github.com/AoteChou/MELT into AoteChou-master

Conflicts:
	.gitignore
	nbproject/project.properties
	src/melt/Main.java
	src/melt/Question.java
	src/melt/QuestionTableModel.java
	src/melt/Util/SQLHelper.java
Merge branch 'AoteChou-master'
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
modify
modify
modify
modify