add preview when editing
add preview when editing
Merge origin/master

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

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

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

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

Conflicts:
	src/melt/View/ExamPreview.java
fsdfsdf
Merge pull request #28 from AoteChou/master

push