Added Student UI
Merge origin/master

Conflicts:
	src/melt/Main.java
	src/melt/Util/jdbc.properties
Merge origin/master into allmamo-master

Conflicts:
	nbproject/project.properties
	src/melt/DAO/QuestionDAO.java
	src/melt/Main.java
	src/melt/Util/SQLHelper.java
	src/melt/Util/jdbc.properties
	src/melt/View/ChooseQuestionsPanel.java
Merge origin/master into allmamo-master

Conflicts:
	nbproject/project.properties
	src/melt/DAO/QuestionDAO.java
	src/melt/Main.java
	src/melt/Util/SQLHelper.java
	src/melt/Util/jdbc.properties
	src/melt/View/ChooseQuestionsPanel.java
Merge branch 'allmamo-master'
Merge origin/master

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