ah
Merge branch 'master' of https://github.com/Wolfprogramming/ExamPlatform.git
Edit Exam
Merge branch 'master' of
https://github.com/Wolfprogramming/ExamPlatform.git

Conflicts:
	WebContent/index.xhtml
	src/managedBeans/ExamListMB.java
	src/managedBeans/LoginMB.java
edit Exam