connected some qdb files
put main back to how it was
Merge pull request #18 from lambchopz/master

Milestone 2 student Model/view update
Merge pull request #19 from nnordhof/master

M2 QDB Model/View update
update student review views and addquestion views linking
fixed nullpointer error
Merge pull request #20 from nnordhof/master

fixed nullpointer error
Fixed java

I think
Merge remote-tracking branch 'upstream/master'