Updates to Different Pages
Merge branch 'master' of https://github.com/macguy2010/QuizBuilder

Conflicts:
	QuizBuilderProject/target/QuizBuilderProject-1.0-SNAPSHOT.war

QuizBuilderProject/target/QuizBuilderProject-1.0-SNAPSHOT/WEB-INF/classe
s/com/nate_tim_dane_company/quizbuilderproject/QuizBuilderEJB.class

QuizBuilderProject/target/QuizBuilderProject-1.0-SNAPSHOT/WEB-INF/classe
s/com/nate_tim_dane_company/quizbuilderproject/QuizController.class

QuizBuilderProject/target/QuizBuilderProject-1.0-SNAPSHOT/WEB-INF/classe
s/com/nate_tim_dane_company/quizbuilderproject/SubjectType.class

QuizBuilderProject/target/QuizBuilderProject-1.0-SNAPSHOT/WEB-INF/classe
s/com/nate_tim_dane_company/quizbuilderproject/UserEJB.class

QuizBuilderProject/target/classes/com/nate_tim_dane_company/quizbuilderp
roject/QuizBuilderEJB.class

QuizBuilderProject/target/classes/com/nate_tim_dane_company/quizbuilderp
roject/QuizController.class

QuizBuilderProject/target/classes/com/nate_tim_dane_company/quizbuilderp
roject/SubjectType.class

QuizBuilderProject/target/classes/com/nate_tim_dane_company/quizbuilderp
roject/UserEJB.class
	QuizBuilderProject/target/maven-archiver/pom.properties