button, layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	ExamGenerator.v12.suo
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	ExamGenerator.v12.suo